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

fix(testing): fix generated testMatch pattern in jest config to support windows (#15415)

Browse Source
This commit is contained in:
Leosvel Pérez Espinosa 2023-03-03 18:30:32 +00:00 committed by GitHub
parent 95c832ae91
commit 5e12d053a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/jest/src/generators/jest-project/files-angular/jest.config.ts__tmpl__
View File

@ -22,6 +22,6 @@
]<% } %><% if(rootProject){ %>, ]<% } %><% if(rootProject){ %>,
testMatch: [ testMatch: [
'<rootDir>/src/**/__tests__/**/*.[jt]s?(x)', '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
'<rootDir>/src/**/?(*.)+(spec|test).[jt]s?(x)', '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
],<% } %> ],<% } %>
}; };

2
packages/jest/src/generators/jest-project/files/jest.config.ts__tmpl__
View File

@ -11,6 +11,6 @@
coverageDirectory: '<%= offsetFromRoot %>coverage/<%= projectRoot %>'<% if(rootProject){ %>, coverageDirectory: '<%= offsetFromRoot %>coverage/<%= projectRoot %>'<% if(rootProject){ %>,
testMatch: [ testMatch: [
'<rootDir>/src/**/__tests__/**/*.[jt]s?(x)', '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
'<rootDir>/src/**/?(*.)+(spec|test).[jt]s?(x)', '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
],<% } %> ],<% } %>
}; };

4
packages/jest/src/generators/jest-project/jest-project.spec.ts
View File

@ -388,7 +388,7 @@ describe('jestProject', () => {
coverageDirectory: './coverage/my-project', coverageDirectory: './coverage/my-project',
testMatch: [ testMatch: [
'<rootDir>/src/**/__tests__/**/*.[jt]s?(x)', '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
'<rootDir>/src/**/?(*.)+(spec|test).[jt]s?(x)', '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
], ],
}; };
" "
@ -421,7 +421,7 @@ describe('jestProject', () => {
coverageDirectory: './coverage/my-project', coverageDirectory: './coverage/my-project',
testMatch: [ testMatch: [
'<rootDir>/src/**/__tests__/**/*.[jt]s?(x)', '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
'<rootDir>/src/**/?(*.)+(spec|test).[jt]s?(x)', '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
], ],
}; };
" "

2
packages/nx/src/nx-init/add-nx-to-nest.ts
View File

@ -281,7 +281,7 @@ function getJestOptions(
delete jestOptions['testRegex']; delete jestOptions['testRegex'];
jestOptions['testMatch'] = isE2E jestOptions['testMatch'] = isE2E
? ['<rootDir>/test/**/?(*.)+(e2e-spec|e2e-test).[jt]s?(x)'] ? ['<rootDir>/test/**/?(*.)+(e2e-spec|e2e-test).[jt]s?(x)']
: ['<rootDir>/src/**/?(*.)+(spec|test).[jt]s?(x)']; : ['<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)'];
// set coverage directory for unit test // set coverage directory for unit test
if (!isE2E) { if (!isE2E) {