Merge pull request #1378 from a-riva/fix/support-commands-without-js-…

…extension Fix commands run without the .js extension
danger · Apr 11, 2023 · c62bff7 · c62bff7
2 parents 12eea7f + 2f3e3b9
commit c62bff7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/source/commands/utils/_tests/dangerRunToRunnerCLI.test.ts b/source/commands/utils/_tests/dangerRunToRunnerCLI.test.ts
@@ -122,11 +122,25 @@ it("should properly replace `danger-runner` in a path that contains an additiona
     dangerRunToRunnerCLI([
       "/Users/Mike.DiDomizio/.nvm/versions/node/v16.13.2/bin/node",
       "/Users/Mike.DiDomizio/projects/test/danger-project-setup/node_modules/danger/distribution/commands/danger-pr.js",
-      "https://github.com/facebook/react/pull/11865"
+      "https://github.com/facebook/react/pull/11865",
     ])
   ).toEqual([
     "/Users/Mike.DiDomizio/.nvm/versions/node/v16.13.2/bin/node",
     "/Users/Mike.DiDomizio/projects/test/danger-project-setup/node_modules/danger/distribution/commands/danger-runner.js",
     "https://github.com/facebook/react/pull/11865",
   ])
 })
+
+it("should properly replace `danger-runner` in a path that contains an additional `danger-pr` in it even without the .js extension", () => {
+  expect(
+    dangerRunToRunnerCLI([
+      "/Users/Mike.DiDomizio/.nvm/versions/node/v16.13.2/bin/node",
+      "/Users/Mike.DiDomizio/projects/test/danger-project-setup/node_modules/danger/distribution/commands/danger-pr",
+      "https://github.com/facebook/react/pull/11865",
+    ])
+  ).toEqual([
+    "/Users/Mike.DiDomizio/.nvm/versions/node/v16.13.2/bin/node",
+    "/Users/Mike.DiDomizio/projects/test/danger-project-setup/node_modules/danger/distribution/commands/danger-runner",
+    "https://github.com/facebook/react/pull/11865",
+  ])
+})
diff --git a/source/commands/utils/dangerRunToRunnerCLI.ts b/source/commands/utils/dangerRunToRunnerCLI.ts
@@ -15,8 +15,8 @@ const dangerRunToRunnerCLI = (argv: string[]) => {
     // convert
     let newJSFile = argv[1]
     usesProcessSeparationCommands.forEach((name) => {
-      const re = new RegExp(`danger-${name}\.js$`)
-      newJSFile = newJSFile.replace(re, "danger-runner.js")
+      const re = new RegExp(`danger-${name}(\.js)?$`)
+      newJSFile = newJSFile.replace(re, "danger-runner$1")
     })
 
     // Support re-routing internally in npx for danger-ts