backend-common: update MockDirectory usage
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
This commit is contained in:
@@ -73,7 +73,7 @@ const urlReaderFactory = (azureIntegration: AzureIntegrationConfigLike) => {
|
||||
};
|
||||
|
||||
describe('AzureUrlReader', () => {
|
||||
beforeEach(() => mockDir.clear());
|
||||
beforeEach(mockDir.clear);
|
||||
|
||||
const worker = setupServer();
|
||||
setupRequestMockHandlers(worker);
|
||||
|
||||
@@ -53,7 +53,7 @@ const reader = new BitbucketCloudUrlReader(
|
||||
);
|
||||
|
||||
describe('BitbucketCloudUrlReader', () => {
|
||||
beforeEach(() => mockDir.clear());
|
||||
beforeEach(mockDir.clear);
|
||||
|
||||
const worker = setupServer();
|
||||
setupRequestMockHandlers(worker);
|
||||
|
||||
@@ -71,7 +71,7 @@ describe('BitbucketUrlReader.factory', () => {
|
||||
describe('BitbucketUrlReader', () => {
|
||||
const mockDir = MockDirectory.mockOsTmpDir();
|
||||
|
||||
beforeEach(() => mockDir.clear());
|
||||
beforeEach(mockDir.clear);
|
||||
|
||||
const treeResponseFactory = DefaultReadTreeResponseFactory.create({
|
||||
config: new ConfigReader({}),
|
||||
|
||||
@@ -93,7 +93,7 @@ describe.skip('GerritUrlReader', () => {
|
||||
const worker = setupServer();
|
||||
setupRequestMockHandlers(worker);
|
||||
|
||||
beforeEach(() => mockDir.clear());
|
||||
beforeEach(mockDir.clear);
|
||||
|
||||
afterAll(() => {
|
||||
jest.clearAllMocks();
|
||||
@@ -256,7 +256,7 @@ describe.skip('GerritUrlReader', () => {
|
||||
);
|
||||
|
||||
beforeEach(async () => {
|
||||
await mockDir.setContent({
|
||||
mockDir.setContent({
|
||||
'repo/mkdocs.yml': mkdocsContent,
|
||||
'repo/docs/first.md': mdContent,
|
||||
});
|
||||
|
||||
@@ -76,7 +76,7 @@ describe('GithubUrlReader', () => {
|
||||
const worker = setupServer();
|
||||
setupRequestMockHandlers(worker);
|
||||
|
||||
beforeEach(() => mockDir.clear());
|
||||
beforeEach(mockDir.clear);
|
||||
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks();
|
||||
|
||||
@@ -69,7 +69,7 @@ const hostedGitlabProcessor = new GitlabUrlReader(
|
||||
);
|
||||
|
||||
describe('GitlabUrlReader', () => {
|
||||
beforeEach(() => mockDir.clear());
|
||||
beforeEach(mockDir.clear);
|
||||
|
||||
const worker = setupServer();
|
||||
setupRequestMockHandlers(worker);
|
||||
|
||||
@@ -34,12 +34,12 @@ describe('ReadableArrayResponse', () => {
|
||||
const sourceDir = MockDirectory.create();
|
||||
const targetDir = MockDirectory.create();
|
||||
|
||||
beforeEach(async () => {
|
||||
await sourceDir.setContent({
|
||||
beforeEach(() => {
|
||||
sourceDir.setContent({
|
||||
[name1]: file1,
|
||||
[name2]: file2,
|
||||
});
|
||||
await targetDir.clear();
|
||||
targetDir.clear();
|
||||
});
|
||||
|
||||
const path1 = sourceDir.resolve(name1);
|
||||
@@ -71,7 +71,7 @@ describe('ReadableArrayResponse', () => {
|
||||
const res = new ReadableArrayResponse(arr, targetDir.path, 'etag');
|
||||
const dir = await res.dir();
|
||||
|
||||
await expect(targetDir.content({ path: dir })).resolves.toEqual({
|
||||
expect(targetDir.content({ path: dir })).toEqual({
|
||||
[name1]: file1.toString('utf8'),
|
||||
[name2]: file2.toString('utf8'),
|
||||
});
|
||||
|
||||
@@ -27,11 +27,11 @@ describe('TarArchiveResponse', () => {
|
||||
const sourceDir = MockDirectory.create();
|
||||
const targetDir = MockDirectory.create();
|
||||
|
||||
beforeAll(async () => {
|
||||
await sourceDir.setContent({ 'test-archive.tar.gz': archiveData });
|
||||
beforeAll(() => {
|
||||
sourceDir.setContent({ 'test-archive.tar.gz': archiveData });
|
||||
});
|
||||
beforeEach(async () => {
|
||||
await targetDir.clear();
|
||||
beforeEach(() => {
|
||||
targetDir.clear();
|
||||
});
|
||||
|
||||
it('should read files', async () => {
|
||||
@@ -143,7 +143,7 @@ describe('TarArchiveResponse', () => {
|
||||
const res = new TarArchiveResponse(stream, 'docs', targetDir.path, 'etag');
|
||||
const dir = await res.dir();
|
||||
|
||||
await expect(targetDir.content({ path: dir })).resolves.toEqual({
|
||||
expect(targetDir.content({ path: dir })).toEqual({
|
||||
'index.md': '# Test\n',
|
||||
});
|
||||
});
|
||||
@@ -161,11 +161,11 @@ describe('TarArchiveResponse', () => {
|
||||
path => path.endsWith('.yml'),
|
||||
);
|
||||
|
||||
await targetDir.addContent({ sub: {} });
|
||||
targetDir.addContent({ sub: {} });
|
||||
const dir = await res.dir({ targetDir: targetDir.resolve('sub') });
|
||||
|
||||
expect(dir).toBe(targetDir.resolve('sub'));
|
||||
await expect(targetDir.content()).resolves.toEqual({
|
||||
expect(targetDir.content()).toEqual({
|
||||
sub: {
|
||||
'mkdocs.yml': 'site_name: Test\n',
|
||||
},
|
||||
@@ -187,7 +187,7 @@ describe('TarArchiveResponse', () => {
|
||||
},
|
||||
);
|
||||
|
||||
await targetDir.addContent({ sub: {} });
|
||||
targetDir.addContent({ sub: {} });
|
||||
const sub = targetDir.resolve('sub');
|
||||
|
||||
const mkdtemp = jest
|
||||
@@ -216,7 +216,7 @@ describe('TarArchiveResponse', () => {
|
||||
},
|
||||
);
|
||||
|
||||
await targetDir.addContent({ sub: {} });
|
||||
targetDir.addContent({ sub: {} });
|
||||
const sub = targetDir.resolve('sub');
|
||||
|
||||
await expect(fs.pathExists(sub)).resolves.toBe(true);
|
||||
|
||||
@@ -38,16 +38,16 @@ describe('ZipArchiveResponse', () => {
|
||||
const sourceDir = MockDirectory.create();
|
||||
const targetDir = MockDirectory.create();
|
||||
|
||||
beforeAll(async () => {
|
||||
await sourceDir.setContent({
|
||||
beforeAll(() => {
|
||||
sourceDir.setContent({
|
||||
'test-archive.zip': archiveData,
|
||||
'test-archive-with-extra-root-dir.zip': archiveDataWithExtraDir,
|
||||
'test-archive-corrupted.zip': archiveDataCorrupted,
|
||||
'test-archive-malicious.zip': archiveWithMaliciousEntry,
|
||||
});
|
||||
});
|
||||
beforeEach(async () => {
|
||||
await targetDir.clear();
|
||||
beforeEach(() => {
|
||||
targetDir.clear();
|
||||
});
|
||||
|
||||
it('should read files', async () => {
|
||||
@@ -151,7 +151,7 @@ describe('ZipArchiveResponse', () => {
|
||||
const res = new ZipArchiveResponse(stream, 'docs/', targetDir.path, 'etag');
|
||||
|
||||
const dir = await res.dir();
|
||||
await expect(targetDir.content({ path: dir })).resolves.toEqual({
|
||||
expect(targetDir.content({ path: dir })).toEqual({
|
||||
'index.md': '# Test\n',
|
||||
});
|
||||
});
|
||||
@@ -167,13 +167,13 @@ describe('ZipArchiveResponse', () => {
|
||||
path => path.endsWith('.yml'),
|
||||
);
|
||||
|
||||
await targetDir.addContent({ sub: {} });
|
||||
targetDir.addContent({ sub: {} });
|
||||
const sub = targetDir.resolve('sub');
|
||||
const dir = await res.dir({ targetDir: sub });
|
||||
|
||||
expect(dir).toBe(sub);
|
||||
|
||||
await expect(targetDir.content()).resolves.toEqual({
|
||||
expect(targetDir.content()).toEqual({
|
||||
sub: {
|
||||
'mkdocs.yml': 'site_name: Test\n',
|
||||
},
|
||||
@@ -209,7 +209,7 @@ describe('ZipArchiveResponse', () => {
|
||||
|
||||
const res = new ZipArchiveResponse(stream, '', targetDir.path, 'etag');
|
||||
|
||||
await targetDir.addContent({ sub: {} });
|
||||
targetDir.addContent({ sub: {} });
|
||||
const sub = targetDir.resolve('sub');
|
||||
const dir = await res.dir({
|
||||
targetDir: sub,
|
||||
|
||||
@@ -29,9 +29,9 @@ describe('DockerContainerRunner', () => {
|
||||
const inputDir = MockDirectory.create();
|
||||
const outputDir = MockDirectory.create();
|
||||
|
||||
beforeEach(async () => {
|
||||
await inputDir.clear();
|
||||
await outputDir.clear();
|
||||
beforeEach(() => {
|
||||
inputDir.clear();
|
||||
outputDir.clear();
|
||||
|
||||
jest.spyOn(mockDocker, 'pull').mockImplementation((async (
|
||||
_image: string,
|
||||
|
||||
Reference in New Issue
Block a user