From 3f21e46725ad9e1029f8eeb9b38ceca52ae1cbba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Tue, 23 Mar 2021 09:07:35 +0100 Subject: [PATCH] fix types in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- plugins/app-backend/src/lib/config.test.ts | 8 ++++---- .../stages/templater/cookiecutter.test.ts | 14 ++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/plugins/app-backend/src/lib/config.test.ts b/plugins/app-backend/src/lib/config.test.ts index 95b34c8422..4018766ac9 100644 --- a/plugins/app-backend/src/lib/config.test.ts +++ b/plugins/app-backend/src/lib/config.test.ts @@ -36,7 +36,7 @@ const baseOptions = { describe('injectConfig', () => { beforeEach(() => { - fsMock.readdir.mockResolvedValue(['main.js']); + fsMock.readdir.mockResolvedValue(['main.js'] as any); }); afterEach(() => { @@ -44,7 +44,7 @@ describe('injectConfig', () => { }); it('should inject without config', async () => { - fsMock.readdir.mockResolvedValue(['main.js']); + fsMock.readdir.mockResolvedValue(['main.js'] as any); readFileMock.mockImplementation( async () => '"__APP_INJECTED_RUNTIME_CONFIG__"', ); @@ -68,7 +68,7 @@ describe('injectConfig', () => { 'not-js.txt', 'main.js', 'after.js', - ]); + ] as any); readFileMock.mockImplementation(async (file: string) => { if (file.endsWith('main.js')) { return '"__APP_INJECTED_RUNTIME_CONFIG__"'; @@ -111,7 +111,7 @@ describe('injectConfig', () => { }); it('should re-inject config', async () => { - fsMock.readdir.mockResolvedValue(['main.js']); + fsMock.readdir.mockResolvedValue(['main.js'] as any); readFileMock.mockResolvedValue( 'JSON.parse("__APP_INJECTED_RUNTIME_CONFIG__")', ); diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts index 537aac3088..763572fda5 100644 --- a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts @@ -48,7 +48,7 @@ describe('CookieCutter Templater', () => { }, }; - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); const templater = new CookieCutter(); await templater.run({ @@ -72,7 +72,7 @@ describe('CookieCutter Templater', () => { jest .spyOn(fs, 'readJSON') .mockImplementationOnce(() => Promise.resolve(existingJson)); - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); const values = { owner: 'blobby', @@ -135,12 +135,10 @@ describe('CookieCutter Templater', () => { }, }; - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); jest .spyOn(fs, 'realpath') - .mockImplementation((filePath: string | Buffer) => - Promise.resolve(filePath as string), - ); + .mockImplementation(x => Promise.resolve(x.toString())); const templater = new CookieCutter(); await templater.run({ @@ -182,7 +180,7 @@ describe('CookieCutter Templater', () => { }, }; - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); const templater = new CookieCutter(); await templater.run({ @@ -226,7 +224,7 @@ describe('CookieCutter Templater', () => { }, }; - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); commandExists.mockImplementationOnce(() => () => true); const templater = new CookieCutter();