From eaa9bb26b0fe57a35089a79ba337841e2cd5c0fe Mon Sep 17 00:00:00 2001 From: Todd Wright Date: Fri, 20 Oct 2023 12:02:19 +1100 Subject: [PATCH] Update sql import tests --- __fixtures__/validations/bad-sql-dump.sql.gz | Bin 0 -> 588 bytes __fixtures__/validations/empty.sql.gz | Bin 20 -> 0 bytes __tests__/bin/vip-import-sql.js | 19 +++++++++++-------- src/lib/client-file-uploader.ts | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 __fixtures__/validations/bad-sql-dump.sql.gz delete mode 100644 __fixtures__/validations/empty.sql.gz diff --git a/__fixtures__/validations/bad-sql-dump.sql.gz b/__fixtures__/validations/bad-sql-dump.sql.gz new file mode 100644 index 0000000000000000000000000000000000000000..8ecc5d98a8192010d913e262f5b5646a79b0d7bb GIT binary patch literal 588 zcmV-S0<--eiwFo@lA~h)17cxhEpu^fEo60Va4vIkYygduQE!_t5XYaFPjPR6l%(CH zO4FuDb-+oj5|d(RmnWd$BuEJ$FrD)4XG3t3snX^Lgnhp|-~IVx`xpfn92B5AVi=NE zl*dGfJk67$`8gVepB+vn;P~DeWRi=4ECBx^EMO4xV|6G`oHub#*?sw*yNZITqH5(C z5E__Y?=1)^BTI@Mpk4qpbX`DU;6;SWDl1F_HXf3OLbN@;^BP`}Z$Ba5{Pyr*>0}LW z^STi(FHq

z@V&S0kWhyGK&kF&JWARu7hPEP0!b?JvVa*F{e8w*m-|cl8F;QUy*<3ZO433}+GE4^ z0;Kz-*l~Gr%|~)*{ z#$fD)sG1*lcTHRIdZNXj?8@m!UQG)w6m{Z_VU4dU?8_tnG`-87rsYwm$r;oad3VL7zh@&saac<2TpXbc8Sa#FJuRI%HNfKY+Zad%|H|V1v a{XX>B7mVyDY(F#T8vFz389%yX1ONbUz8>8G literal 0 HcmV?d00001 diff --git a/__fixtures__/validations/empty.sql.gz b/__fixtures__/validations/empty.sql.gz deleted file mode 100644 index f64d3be3bc928dfe4fb00361426d27903ec4dc80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20 Ucmb2|=3w}L*dUdGnVA6w05HA-5C8xG diff --git a/__tests__/bin/vip-import-sql.js b/__tests__/bin/vip-import-sql.js index 775f1e679b..9ce9b03128 100644 --- a/__tests__/bin/vip-import-sql.js +++ b/__tests__/bin/vip-import-sql.js @@ -80,23 +80,26 @@ describe( 'vip-import-sql', () => { } ); it( 'fails if the import file has an invalid extension', async () => { - const compressedFilePath = path.join( + const invalidFilePath = path.join( process.cwd(), '__fixtures__', 'validations', 'empty.zip' ); - await gates( opts.app, opts.env, compressedFilePath ); - expect( mockExit ).toHaveBeenCalledWith( 'File must have an extension of .gz or .sql.' ); + const fileMeta = { fileName: invalidFilePath, basename: 'empty.zip' }; + await gates( opts.app, opts.env, fileMeta ); + expect( mockExit ).toHaveBeenCalledWith( + 'Invalid file extension. Please provide a .sql or .gz file.' + ); } ); - it.each( [ 'empty.sql.gz', 'bad-sql-dump.sql' ] )( + it.each( [ 'bad-sql-dump.sql.gz', 'bad-sql-dump.sql' ] )( 'passes if the import file has a valid extension', - async fileName => { - const validPath = path.join( process.cwd(), '__fixtures__', 'validations', fileName ); - - await gates( opts.app, opts.env, validPath ); + async basename => { + const validFilePath = path.join( process.cwd(), '__fixtures__', 'validations', basename ); + const fileMeta = { fileName: validFilePath, basename }; + await gates( opts.app, opts.env, fileMeta ); expect( mockExit ).not.toHaveBeenCalled(); } ); diff --git a/src/lib/client-file-uploader.ts b/src/lib/client-file-uploader.ts index 14e70142d9..625666d5f2 100644 --- a/src/lib/client-file-uploader.ts +++ b/src/lib/client-file-uploader.ts @@ -136,6 +136,7 @@ export const unzipFile = async ( const extractionInfo = extractFunctions[ mimeType ]; + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition if ( ! extractionInfo ) { throw new Error( `unsupported file format: ${ mimeType }` ); }