Merge f25a288 into b92c6f8

jest-community · Jun 27, 2023 · 24e13dc · 24e13dc
2 parents b92c6f8 + f25a288
commit 24e13dc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/src/DebugConfigurationProvider.ts b/src/DebugConfigurationProvider.ts
@@ -109,20 +109,10 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
       if (typeof arg !== 'string') {
         return arg;
       }
-      switch (true) {
-        case testFileRegex.test(arg): {
-          return arg.replace(testFileRegex, toFilePath(this.fileNameToRun));
-        }
-        case testFilePatternRegex.test(arg): {
-          return arg.replace(testFilePatternRegex, escapeRegExp(this.fileNameToRun));
-        }
-        case testNamePatternRegex.test(arg): {
-          return arg.replace(testNamePatternRegex, this.testToRun);
-        }
-
-        default:
-          return arg;
-      }
+      return arg
+        .replace(testFileRegex, toFilePath(this.fileNameToRun))
+        .replace(testFilePatternRegex, escapeRegExp(this.fileNameToRun))
+        .replace(testNamePatternRegex, this.testToRun);
     });
     debugConfiguration.args = args;
 

diff --git a/tests/DebugConfigurationProvider.test.ts b/tests/DebugConfigurationProvider.test.ts
@@ -128,6 +128,26 @@ describe('DebugConfigurationProvider', () => {
       expect(configuration).toBeDefined();
       expect(configuration.args).toEqual(expected);
     });
+    it('will translate multiple variables in a single arg', () => {
+      (toFilePath as unknown as jest.Mock<{}>).mockReturnValueOnce(fileName);
+      (escapeRegExp as unknown as jest.Mock<{}>).mockReturnValueOnce(fileNamePattern);
+
+      let configuration: any = {
+        name: 'vscode-jest-tests.v2',
+        args: ['--testNamePattern "${jest.testNamePattern}" --runTestsByPath "${jest.testFile}"'],
+      };
+
+      const sut = new DebugConfigurationProvider();
+      const ws = makeWorkspaceFolder('whatever');
+      sut.prepareTestRun(fileName, testName, ws);
+
+      configuration = sut.resolveDebugConfiguration(undefined, configuration);
+
+      expect(configuration).toBeDefined();
+      expect(configuration.args).toEqual([
+        `--testNamePattern "${testName}" --runTestsByPath "${fileName}"`,
+      ]);
+    });
   });
   describe('can generate debug config with jestCommandLine and rootPath', () => {
     const canRunTest = (isWin32: boolean) =>