update browser type usage

cypress-io · Jan 31, 2020 · 06e1170 · 06e1170 · cypress-bot · Jan 31, 2020
1 parent 84f816f
commit 06e1170
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/packages/launcher/lib/browsers.ts b/packages/launcher/lib/browsers.ts
@@ -37,24 +37,27 @@ export const browsers: Browser[] = [
  {
  name: 'firefox',
  family: 'firefox',
+ channel: 'stable',
  displayName: 'Firefox',
  info: firefoxInfo,
  versionRegex: /Firefox (\S+)/,
  profile: true,
  binary: 'firefox',
  },
  {
- name: 'firefoxDeveloperEdition',
+ name: 'firefox',
  family: 'firefox',
+ channel: 'dev',
  displayName: 'Firefox Developer Edition',
  info: firefoxInfo,
  versionRegex: /Firefox Developer Edition (\S+)/,
  profile: true,
  binary: 'firefox-developer-edition',
  },
  {
- name: 'firefoxNightly',
+ name: 'firefox',
  family: 'firefox',
+ channel: 'nightly',
  displayName: 'Firefox Nightly',
  info: firefoxInfo,
  versionRegex: /Firefox Nightly (\S+)/,

diff --git a/packages/server/lib/modes/run.js b/packages/server/lib/modes/run.js
@@ -1254,7 +1254,7 @@ module.exports = {
  browser,
  })
 
- if ((browser.family !== 'chrome' && browser.family !== 'electron') && !options.config.chromeWebSecurity) {
+ if (browser.family !== 'chromium' && !options.config.chromeWebSecurity) {
  console.log()
  errors.warning('CHROME_WEB_SECURITY_NOT_SUPPORTED', browser.family)
  }

diff --git a/packages/server/lib/project.js b/packages/server/lib/project.js
@@ -96,7 +96,7 @@ class Project extends EE {
  // attach warning message if user has "chromeWebSecurity: false" for unsupported browser
  if (cfg.chromeWebSecurity === false) {
  _.chain(cfg.browsers)
- .filter((browser) => !(browser.family === 'chrome' || browser.family === 'electron'))
+ .filter((browser) => browser.family !== 'chromium')
  .each((browser) => browser.warning = errors.getMsgByType('CHROME_WEB_SECURITY_NOT_SUPPORTED', browser.name))
  .value()
  }

diff --git a/packages/server/test/unit/browsers/browsers_spec.coffee b/packages/server/test/unit/browsers/browsers_spec.coffee
@@ -9,6 +9,7 @@ describe "lib/browsers/index", ->
  context ".isBrowserFamily", ->
  it "allows only known browsers", ->
  expect(browsers.isBrowserFamily("chromium")).to.be.true
+ expect(browsers.isBrowserFamily("firefox")).to.be.true
  expect(browsers.isBrowserFamily("chrome")).to.be.false
  expect(browsers.isBrowserFamily("electron")).to.be.false
  expect(browsers.isBrowserFamily("my-favorite-browser")).to.be.false

diff --git a/packages/server/test/unit/project_spec.js b/packages/server/test/unit/project_spec.js
@@ -287,7 +287,7 @@ describe('lib/project', () => {
 
  it('attaches warning to non-chrome browsers when chromeWebSecurity:false', function () {
  Object.assign(this.config, {
- browsers: [{ family: 'chrome', name: 'Canary' }, { family: 'some-other-family', name: 'some-other-name' }],
+ browsers: [{ family: 'chromium', name: 'Canary' }, { family: 'some-other-family', name: 'some-other-name' }],
  chromeWebSecurity: false,
  })
 
@@ -297,7 +297,7 @@ describe('lib/project', () => {
  expect(config.chromeWebSecurity).eq(false)
  expect(config.browsers).deep.eq([
  {
- family: 'chrome',
+ family: 'chromium',
  name: 'Canary',
  },
  {