github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-23 10:16:32 -05:00
Code Issues Projects Releases Packages Wiki Activity

PublicE2E: Remove uploaded files after test

Browse source 
This way the tests can run in any order as some of the media tests rely on an empty (or non-existing) uploads directory.
Also the me e2e test was renamed to the correct name.

Signed-off-by: Philip Molares <philip.molares@udo.edu>
This commit is contained in:
Philip Molares 2021-03-24 11:18:26 +01:00
parent 6e03f876db
commit 69550a8243
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
test/public-api/me.e2e-spec.ts
View file

@ -29,7 +29,7 @@ import { LoggerModule } from '../../src/logger/logger.module';
import { AuthModule } from '../../src/auth/auth.module'; import { AuthModule } from '../../src/auth/auth.module';
import { UsersModule } from '../../src/users/users.module'; import { UsersModule } from '../../src/users/users.module';
import { HistoryModule } from '../../src/history/history.module'; import { HistoryModule } from '../../src/history/history.module';
import { ConfigModule } from '@nestjs/config'; import { ConfigModule, ConfigService } from '@nestjs/config';
import mediaConfigMock from '../../src/config/mock/media.config.mock'; import mediaConfigMock from '../../src/config/mock/media.config.mock';
import appConfigMock from '../../src/config/mock/app.config.mock'; import appConfigMock from '../../src/config/mock/app.config.mock';
import { User } from '../../src/users/user.entity'; import { User } from '../../src/users/user.entity';
@ -37,15 +37,17 @@ import { MediaService } from '../../src/media/media.service';
import { MediaModule } from '../../src/media/media.module'; import { MediaModule } from '../../src/media/media.module';
import { promises as fs } from 'fs'; import { promises as fs } from 'fs';
import { NoteMetadataDto } from '../../src/notes/note-metadata.dto'; import { NoteMetadataDto } from '../../src/notes/note-metadata.dto';
import { join } from 'path';
// TODO Tests have to be reworked using UserService functions // TODO Tests have to be reworked using UserService functions
describe('Notes', () => { describe('Me', () => {
let app: INestApplication; let app: INestApplication;
let historyService: HistoryService; let historyService: HistoryService;
let notesService: NotesService; let notesService: NotesService;
let userService: UsersService; let userService: UsersService;
let mediaService: MediaService; let mediaService: MediaService;
let uploadPath: string;
let user: User; let user: User;
beforeAll(async () => { beforeAll(async () => {
@ -76,6 +78,8 @@ describe('Notes', () => {
.overrideGuard(TokenAuthGuard) .overrideGuard(TokenAuthGuard)
.useClass(MockAuthGuard) .useClass(MockAuthGuard)
.compile(); .compile();
const config = moduleRef.get<ConfigService>(ConfigService);
uploadPath = config.get('mediaConfig').backend.filesystem.uploadPath;
app = moduleRef.createNestApplication(); app = moduleRef.createNestApplication();
notesService = moduleRef.get(NotesService); notesService = moduleRef.get(NotesService);
historyService = moduleRef.get(HistoryService); historyService = moduleRef.get(HistoryService);
@ -261,6 +265,12 @@ describe('Notes', () => {
expect(response.body[1].url).toEqual(url1); expect(response.body[1].url).toEqual(url1);
expect(response.body[2].url).toEqual(url2); expect(response.body[2].url).toEqual(url2);
expect(response.body[3].url).toEqual(url3); expect(response.body[3].url).toEqual(url3);
for (const fileUrl of [url0, url1, url2, url3]) {
const fileName = fileUrl.replace('/uploads/', '');
// delete the file afterwards
await fs.unlink(join(uploadPath, fileName));
}
await fs.rmdir(uploadPath);
}); });
afterAll(async () => { afterAll(async () => {

9
test/public-api/notes.e2e-spec.ts
View file

@ -31,6 +31,7 @@ import { User } from '../../src/users/user.entity';
import { UsersModule } from '../../src/users/users.module'; import { UsersModule } from '../../src/users/users.module';
import { promises as fs } from 'fs'; import { promises as fs } from 'fs';
import { MediaService } from '../../src/media/media.service'; import { MediaService } from '../../src/media/media.service';
import { join } from 'path';
describe('Notes', () => { describe('Notes', () => {
let app: INestApplication; let app: INestApplication;
@ -40,6 +41,7 @@ describe('Notes', () => {
let user2: User; let user2: User;
let content: string; let content: string;
let forbiddenNoteId: string; let forbiddenNoteId: string;
let uploadPath: string;
beforeAll(async () => { beforeAll(async () => {
const moduleRef = await Test.createTestingModule({ const moduleRef = await Test.createTestingModule({
@ -70,6 +72,7 @@ describe('Notes', () => {
const config = moduleRef.get<ConfigService>(ConfigService); const config = moduleRef.get<ConfigService>(ConfigService);
forbiddenNoteId = config.get('appConfig').forbiddenNoteIds[0]; forbiddenNoteId = config.get('appConfig').forbiddenNoteIds[0];
uploadPath = config.get('mediaConfig').backend.filesystem.uploadPath;
app = moduleRef.createNestApplication(); app = moduleRef.createNestApplication();
await app.init(); await app.init();
notesService = moduleRef.get(NotesService); notesService = moduleRef.get(NotesService);
@ -354,6 +357,12 @@ describe('Notes', () => {
expect(responseAfter.body).toHaveLength(1); expect(responseAfter.body).toHaveLength(1);
expect(responseAfter.body[0].url).toEqual(url0); expect(responseAfter.body[0].url).toEqual(url0);
expect(responseAfter.body[0].url).not.toEqual(url1); expect(responseAfter.body[0].url).not.toEqual(url1);
for (const fileUrl of [url0, url1]) {
const fileName = fileUrl.replace('/uploads/', '');
// delete the file afterwards
await fs.unlink(join(uploadPath, fileName));
}
await fs.rmdir(uploadPath);
}); });
it('fails, when note does not exist', async () => { it('fails, when note does not exist', async () => {
await request(app.getHttpServer()) await request(app.getHttpServer())