From bf3fc41196d249b98529bc9fd3b74c30778d0f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?=
 <leosvel.perez.espinosa@gmail.com>
Date: Fri, 3 Mar 2023 18:30:32 +0000
Subject: [PATCH] fix(testing): fix generated testMatch pattern in jest config
 to support windows (#15415)

(cherry picked from commit 5e12d053a93e688d6a3bb1c782814c3fbee04451)
---
 .../jest-project/files-angular/jest.config.ts__tmpl__         | 2 +-
 .../src/generators/jest-project/files/jest.config.ts__tmpl__  | 2 +-
 .../jest/src/generators/jest-project/jest-project.spec.ts     | 4 ++--
 packages/nx/src/nx-init/add-nx-to-nest.ts                     | 2 +-
 4 files changed, 5 insertions(+), 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__
index c5b4210604218..1db519aa49ac3 100644
--- 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__
index 8f4240bff7517..bf46ea8d95518 100644
--- 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
index 9969bde213c3b..2381d0f361a04 100644
--- 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
index a1fdba425781f..13a6f494834a5 100644
--- 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) {