Fix browser detection with multiline --versions (#6712)

cypress-io · Mar 12, 2020 · 9caf21a · 9caf21a · cypress-bot · Mar 12, 2020
1 parent 1d84887
commit 9caf21a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 12 deletions.
diff --git a/packages/launcher/lib/browsers.ts b/packages/launcher/lib/browsers.ts
@@ -11,7 +11,7 @@ export const browsers: Browser[] = [
     family: 'chromium',
     channel: 'stable',
     displayName: 'Chrome',
-    versionRegex: /Google Chrome (\S+)/,
+    versionRegex: /Google Chrome (\S+)/m,
     profile: true,
     binary: ['google-chrome', 'chrome', 'google-chrome-stable'],
   },
@@ -21,7 +21,7 @@ export const browsers: Browser[] = [
     // technically Chromium is always in development
     channel: 'stable',
     displayName: 'Chromium',
-    versionRegex: /Chromium (\S+)/,
+    versionRegex: /Chromium (\S+)/m,
     profile: true,
     binary: ['chromium-browser', 'chromium'],
   },
@@ -30,7 +30,7 @@ export const browsers: Browser[] = [
     family: 'chromium',
     channel: 'canary',
     displayName: 'Canary',
-    versionRegex: /Google Chrome Canary (\S+)/,
+    versionRegex: /Google Chrome Canary (\S+)/m,
     profile: true,
     binary: 'google-chrome-canary',
   },
@@ -41,7 +41,7 @@ export const browsers: Browser[] = [
     displayName: 'Firefox',
     info: firefoxInfo,
     // Mozilla Firefox 70.0.1
-    versionRegex: /^Mozilla Firefox ([^\sab]+)$/,
+    versionRegex: /^Mozilla Firefox ([^\sab]+)$/m,
     profile: true,
     binary: 'firefox',
   },
@@ -52,7 +52,7 @@ export const browsers: Browser[] = [
     displayName: 'Firefox Developer Edition',
     info: firefoxInfo,
     // Mozilla Firefox 73.0b12
-    versionRegex: /^Mozilla Firefox (\S+b\S*)$/,
+    versionRegex: /^Mozilla Firefox (\S+b\S*)$/m,
     profile: true,
     // ubuntu PPAs install it as firefox
     binary: ['firefox-developer-edition', 'firefox'],
@@ -64,7 +64,7 @@ export const browsers: Browser[] = [
     displayName: 'Firefox Nightly',
     info: firefoxInfo,
     // Mozilla Firefox 74.0a1
-    versionRegex: /^Mozilla Firefox (\S+a\S*)$/,
+    versionRegex: /^Mozilla Firefox (\S+a\S*)$/m,
     profile: true,
     // ubuntu PPAs install it as firefox-trunk
     binary: ['firefox-nightly', 'firefox-trunk'],
@@ -74,7 +74,7 @@ export const browsers: Browser[] = [
     family: 'chromium',
     channel: 'stable',
     displayName: 'Edge',
-    versionRegex: /Microsoft Edge (\S+)/,
+    versionRegex: /Microsoft Edge (\S+)/m,
     profile: true,
     binary: 'edge',
   },
@@ -83,7 +83,7 @@ export const browsers: Browser[] = [
     family: 'chromium',
     channel: 'canary',
     displayName: 'Edge Canary',
-    versionRegex: /Microsoft Edge Canary (\S+)/,
+    versionRegex: /Microsoft Edge Canary (\S+)/m,
     profile: true,
     binary: 'edge-canary',
   },
@@ -92,7 +92,7 @@ export const browsers: Browser[] = [
     family: 'chromium',
     channel: 'beta',
     displayName: 'Edge Beta',
-    versionRegex: /Microsoft Edge Beta (\S+)/,
+    versionRegex: /Microsoft Edge Beta (\S+)/m,
     profile: true,
     binary: 'edge-beta',
   },
@@ -101,7 +101,7 @@ export const browsers: Browser[] = [
     family: 'chromium',
     channel: 'dev',
     displayName: 'Edge Dev',
-    versionRegex: /Microsoft Edge Dev (\S+)/,
+    versionRegex: /Microsoft Edge Dev (\S+)/m,
     profile: true,
     binary: 'edge-dev',
   },

diff --git a/packages/launcher/test/fixtures.ts b/packages/launcher/test/fixtures.ts
@@ -2,14 +2,14 @@ export const goalBrowsers = [
   {
     displayName: 'Test Browser',
     name: 'test-browser-name',
-    versionRegex: /test-browser v(\S+)$/,
+    versionRegex: /test-browser v(\S+)$/m,
     profile: true,
     binary: 'test-browser',
   },
   {
     displayName: 'Foo Browser',
     name: 'foo-browser',
-    versionRegex: /foo-browser v(\S+)$/,
+    versionRegex: /foo-browser v(\S+)$/m,
     profile: true,
     binary: ['foo-browser', 'foo-bar-browser'],
   },

diff --git a/packages/launcher/test/unit/browsers_spec.ts b/packages/launcher/test/unit/browsers_spec.ts
@@ -1,8 +1,17 @@
+import _ from 'lodash'
 import { browsers } from '../../lib/browsers'
+import { expect } from 'chai'
 const snapshot = require('snap-shot-it')
 
 describe('browsers', () => {
   it('returns the expected list of browsers', () => {
     snapshot(browsers)
   })
+
+  // https://github.com/cypress-io/cypress/issues/6669
+  it('exports multiline versionRegexes', () => {
+    expect(_.every(browsers.map(({ versionRegex }) => {
+      return versionRegex.multiline
+    }))).to.be.true
+  })
 })
diff --git a/packages/launcher/test/unit/linux_spec.ts b/packages/launcher/test/unit/linux_spec.ts
@@ -1,5 +1,6 @@
 require('../spec_helper')
 
+import _ from 'lodash'
 import * as linuxHelper from '../../lib/linux'
 import 'chai-as-promised'
 import { log } from '../log'
@@ -42,6 +43,24 @@ describe('linux browser detection', () => {
     return linuxHelper.detect(goal).then(checkBrowser)
   })
 
+  // https://github.com/cypress-io/cypress/issues/6669
+  it('detects browser if the --version stdout is multiline', () => {
+    stdout.withArgs('multiline-foo', ['--version'])
+    .resolves('Running without a11y support!\nfoo-browser v9001.1.2.3')
+
+    const goal = _.defaults({ binary: 'multiline-foo' }, _.find(goalBrowsers, { name: 'foo-browser' }))
+    const checkBrowser = (browser) => {
+      expect(browser).to.deep.equal({
+        name: 'foo-browser',
+        path: 'multiline-foo',
+        version: '9001.1.2.3',
+      })
+    }
+
+    // @ts-ignore
+    return linuxHelper.detect(goal).then(checkBrowser)
+  })
+
   // despite using detect(), this test is in linux/spec instead of detect_spec because it is
   // testing side effects that occur within the Linux-specific detect function
   // https://github.com/cypress-io/cypress/issues/1400