fix: updated CYPRESS_DOWNLOAD_PATH_TEMPLATE regex to allow multiple r…

…eplacements (#25531)
cypress-io · May 5, 2023 · 63be85f · 63be85f · cypress-bot · May 5, 2023
1 parent 1d7ae10
commit 63be85f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -7,6 +7,7 @@ _Released 05/09/2023 (PENDING)_
 
 - Fixed an issue in Electron where devtools gets out of sync with the DOM occasionally. Addresses [#15932](https://github.com/cypress-io/cypress/issues/15932).
 - Updated the Chromium renderer process crash message to be more terse. Addressed in [#26597](https://github.com/cypress-io/cypress/pull/26597).
+- Fixed an issue with `CYPRESS_DOWNLOAD_PATH_TEMPLATE` regex to allow multiple replacements. Addresses [#23670](https://github.com/cypress-io/cypress/issues/23670).
 
 **Dependency Updates:**
 

diff --git a/cli/__snapshots__/download_spec.js b/cli/__snapshots__/download_spec.js
@@ -60,3 +60,7 @@ https://download.cypress.io/desktop/0.20.2/OS-ARCH/cypress.zip
 exports['desktop url from template with escaped dollar sign wrapped in quote'] = `
 https://download.cypress.io/desktop/0.20.2/OS-ARCH/cypress.zip
 `
+
+exports['desktop url from template with multiple replacements'] = `
+https://download.cypress.io/desktop/0.20.2/OS/ARCH/cypress-0.20.2-OS-ARCH.zip?referrer=https://download.cypress.io/desktop/0.20.2&version=0.20.2
+`
diff --git a/cli/lib/tasks/download.js b/cli/lib/tasks/download.js
@@ -64,10 +64,10 @@ const prepend = (arch, urlPath, version) => {
   return pathTemplate
     ? (
       pathTemplate
-      .replace(/\\?\$\{endpoint\}/, endpoint)
-      .replace(/\\?\$\{platform\}/, platform)
-      .replace(/\\?\$\{arch\}/, arch)
-      .replace(/\\?\$\{version\}/, version)
+      .replace(/\\?\$\{endpoint\}/g, endpoint)
+      .replace(/\\?\$\{platform\}/g, platform)
+      .replace(/\\?\$\{arch\}/g, arch)
+      .replace(/\\?\$\{version\}/g, version)
     )
     : `${endpoint}?platform=${platform}&arch=${arch}`
 }

diff --git a/cli/test/lib/tasks/download_spec.js b/cli/test/lib/tasks/download_spec.js
@@ -81,6 +81,13 @@ describe('lib/tasks/download', function () {
       snapshot('desktop url from template with version', normalize(url))
     })
 
+    it('returns custom url from template with multiple replacements', () => {
+      process.env.CYPRESS_DOWNLOAD_PATH_TEMPLATE = '${endpoint}/${platform}/${arch}/cypress-${version}-${platform}-${arch}.zip?referrer=${endpoint}&version=${version}'
+      const url = download.getUrl('ARCH', '0.20.2')
+
+      snapshot('desktop url from template with multiple replacements', normalize(url))
+    })
+
     it('returns custom url from template with escaped dollar sign', () => {
       process.env.CYPRESS_DOWNLOAD_PATH_TEMPLATE = '\\${endpoint}/\\${platform}-\\${arch}/cypress.zip'
       const url = download.getUrl('ARCH', '0.20.2')