chore: fix failing windows test (#10829)

jestjs · Nov 15, 2020 · 45c0b2a · 45c0b2a
1 parent ed90920
commit 45c0b2a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/e2e/__tests__/jestChangedFiles.test.ts b/e2e/__tests__/jestChangedFiles.test.ts
@@ -23,7 +23,15 @@ const gitVersionSupportsInitialBranch = (() => {
   const {stdout} = run(`${GIT} --version`);
   const gitVersion = stdout.split(' ').slice(-1)[0];
 
-  return semver.gte(gitVersion, '2.28.0');
+  const match = gitVersion.match(/(?<version>\d+\.\d+\.\d+)/);
+
+  if (match?.groups?.version == null) {
+    throw new Error(`Unable to parse git version from string "${gitVersion}"`);
+  }
+
+  const {version} = match.groups;
+
+  return semver.gte(version, '2.28.0');
 })();
 
 const mainBranchName = gitVersionSupportsInitialBranch ? 'main' : 'master';

diff --git a/e2e/__tests__/onlyChanged.test.ts b/e2e/__tests__/onlyChanged.test.ts
@@ -19,7 +19,15 @@ const gitVersionSupportsInitialBranch = (() => {
   const {stdout} = run(`${GIT} --version`);
   const gitVersion = stdout.split(' ').slice(-1)[0];
 
-  return semver.gte(gitVersion, '2.28.0');
+  const match = gitVersion.match(/(?<version>\d+\.\d+\.\d+)/);
+
+  if (match?.groups?.version == null) {
+    throw new Error(`Unable to parse git version from string "${gitVersion}"`);
+  }
+
+  const {version} = match.groups;
+
+  return semver.gte(version, '2.28.0');
 })();
 
 const mainBranchName = gitVersionSupportsInitialBranch ? 'main' : 'master';