miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(testing): pass setupFilesAfterEnv to jest.runCLI rather than deprecated option (#1808)

Browse Source 
resolves #1343
This commit is contained in:
Jo Pearce 2019-09-16 16:22:09 +01:00 committed by GitHub
parent 5de142f69f
commit 28327d30fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/jest/src/builders/jest/jest.impl.spec.ts
View File

@ -224,7 +224,7 @@ describe('Jest Builder', () => {
const run = await architect.scheduleBuilder('@nrwl/jest:jest', { const run = await architect.scheduleBuilder('@nrwl/jest:jest', {
jestConfig: './jest.config.js', jestConfig: './jest.config.js',
tsConfig: './tsconfig.test.json', tsConfig: './tsconfig.test.json',
setupFile: './test.ts', setupFile: './test-setup.ts',
watch: false watch: false
}); });
expect(await run.result).toEqual( expect(await run.result).toEqual(
@ -274,7 +274,7 @@ describe('Jest Builder', () => {
] ]
} }
}), }),
setupTestFrameworkScriptFile: '/root/test.ts', setupFilesAfterEnv: ['/root/test-setup.ts'],
watch: false watch: false
}, },
['/root/jest.config.js'] ['/root/jest.config.js']

11
packages/jest/src/builders/jest/jest.impl.ts
View File

@ -14,7 +14,7 @@ try {
require('dotenv').config(); require('dotenv').config();
} catch (e) {} } catch (e) {}
const { runCLI } = require('jest'); import { runCLI } from 'jest';
export interface JestBuilderOptions extends JsonObject { export interface JestBuilderOptions extends JsonObject {
codeCoverage?: boolean; codeCoverage?: boolean;
@ -106,10 +106,9 @@ function run(
}; };
if (options.setupFile) { if (options.setupFile) {
config.setupTestFrameworkScriptFile = path.resolve( config.setupFilesAfterEnv = [
context.workspaceRoot, path.resolve(context.workspaceRoot, options.setupFile)
options.setupFile ];
);
} }
if (options.testFile) { if (options.testFile) {
@ -131,7 +130,7 @@ function run(
} }
return from(runCLI(config, [options.jestConfig])).pipe( return from(runCLI(config, [options.jestConfig])).pipe(
map((results: any) => { map(results => {
return { return {
success: results.results.success success: results.results.success
}; };