fix headless e2e spec for firefox

cypress-io · Dec 19, 2019 · 8c1fefe · 8c1fefe · cypress-bot · Dec 19, 2019
1 parent 71ec063
commit 8c1fefe
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/packages/server/__snapshots__/2_headless_spec.ts.js b/packages/server/__snapshots__/2_headless_spec.ts.js
@@ -1,4 +1,4 @@
-exports['e2e headless / tests in headless mode pass'] = `
+exports['e2e headless / tests in headed mode pass in !electron'] = `
 
 ====================================================================================================
 
@@ -61,7 +61,7 @@ exports['e2e headless / tests in headless mode pass'] = `
 
 `
 
-exports['e2e headless / tests in headed mode pass [chrome]'] = `
+exports['e2e headless / tests in headless mode pass'] = `
 
 ====================================================================================================
 
@@ -124,7 +124,7 @@ exports['e2e headless / tests in headed mode pass [chrome]'] = `
 
 `
 
-exports['e2e headless / tests in headed mode pass [electron]'] = `
+exports['e2e headless / tests in headed mode pass in electron'] = `
 
 ====================================================================================================
 

diff --git a/packages/server/test/e2e/2_headless_spec.ts b/packages/server/test/e2e/2_headless_spec.ts
@@ -3,9 +3,10 @@ const e2e = require('../support/helpers/e2e')
 describe('e2e headless', function () {
  e2e.setup()
 
- // cypress run
+ // cypress run --headless
  e2e.it('tests in headless mode pass', {
  spec: 'headless_spec.js',
+ browser: ['chrome', 'electron'],
  config: {
  env: {
  'CI': process.env.CI,
@@ -18,18 +19,20 @@ describe('e2e headless', function () {
  })
 
  // cypress run --headed
- e2e.it('tests in headed mode pass', {
- spec: 'headless_spec.js',
- config: {
- env: {
- 'CI': process.env.CI,
+ // currently, Electron differs because it displays a
+ // "can not record video in headed mode" error
+ ;['electron', '!electron'].map((b) => {
+ e2e.it(`tests in headed mode pass in ${b}`, {
+ spec: 'headless_spec.js',
+ config: {
+ env: {
+ 'CI': process.env.CI,
+ },
  },
- },
- expectedExitCode: 0,
- headed: true,
- snapshot: true,
- // currently, Electron differs because it displays a
- // "can not record video in headed mode" error
- useSeparateBrowserSnapshots: true,
+ expectedExitCode: 0,
+ headed: true,
+ snapshot: true,
+ browser: b,
+ })
  })
 })
diff --git a/packages/server/test/support/helpers/e2e.js b/packages/server/test/support/helpers/e2e.js
@@ -265,10 +265,10 @@ function getBrowsers (browserPattern) {
  let selected = []
 
  const addBrowsers = _.clone(browserPattern)
- const removeBrowsers = _.remove(addBrowsers, (b) => b.startsWith('!'))
+ const removeBrowsers = _.remove(addBrowsers, (b) => b.startsWith('!')).map((b) => b.slice(1))
 
  if (removeBrowsers.length) {
- selected = _.without(AVAILABLE_BROWSERS, removeBrowsers.map((b) => b.slice(1)))
+ selected = _.without(AVAILABLE_BROWSERS, ...removeBrowsers)
  } else {
  selected = _.intersection(AVAILABLE_BROWSERS, addBrowsers)
  }