fix(testing): fix generated testMatch pattern in jest config to suppo…

…rt windows (#15415) (cherry picked from commit 5e12d05)
nrwl · Mar 3, 2023 · bf3fc41 · bf3fc41
1 parent 87b1a73
commit bf3fc41
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/jest/src/generators/jest-project/files-angular/jest.config.ts__tmpl__ b/packages/jest/src/generators/jest-project/files-angular/jest.config.ts__tmpl__
@@ -22,6 +22,6 @@
   ]<% } %><% if(rootProject){ %>,
   testMatch: [
     '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
-    '<rootDir>/src/**/?(*.)+(spec|test).[jt]s?(x)',
+    '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
   ],<% } %>
 };
diff --git a/packages/jest/src/generators/jest-project/files/jest.config.ts__tmpl__ b/packages/jest/src/generators/jest-project/files/jest.config.ts__tmpl__
@@ -11,6 +11,6 @@
   coverageDirectory: '<%= offsetFromRoot %>coverage/<%= projectRoot %>'<% if(rootProject){ %>,
   testMatch: [
     '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
-    '<rootDir>/src/**/?(*.)+(spec|test).[jt]s?(x)',
+    '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
   ],<% } %>
 };
diff --git a/packages/jest/src/generators/jest-project/jest-project.spec.ts b/packages/jest/src/generators/jest-project/jest-project.spec.ts
@@ -388,7 +388,7 @@ describe('jestProject', () => {
           coverageDirectory: './coverage/my-project',
           testMatch: [
             '<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',
           testMatch: [
             '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
-            '<rootDir>/src/**/?(*.)+(spec|test).[jt]s?(x)',
+            '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
           ],
         };
         "

diff --git a/packages/nx/src/nx-init/add-nx-to-nest.ts b/packages/nx/src/nx-init/add-nx-to-nest.ts
@@ -281,7 +281,7 @@ function getJestOptions(
   delete jestOptions['testRegex'];
   jestOptions['testMatch'] = isE2E
     ? ['<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
   if (!isE2E) {