[WIP] Electron 6.0.10

circle.yml

@@ -23,7 +23,7 @@ executors:
   # the Docker image with Cypress dependencies and Chrome browser
   cy-doc:
     docker:
-      - image: cypress/browsers:node12.0.0-chrome73
+      - image: cypress/browsers:node12.4.0-chrome76
     environment:
       PLATFORM: linux
 

packages/electron/package.json

@@ -26,7 +26,7 @@
     "minimist": "1.2.0"
   },
   "devDependencies": {
-    "electron": "5.0.10",
+    "electron": "6.0.10",
     "mocha": "3.5.3"
   },
   "files": [

packages/server/__snapshots__/8_reporters_spec.coffee.js

@@ -697,8 +697,6 @@ Error: this reporter threw an error
     at stack trace line
     at stack trace line
     at stack trace line
-    at stack trace line
-    at stack trace line
 
 Learn more at https://on.cypress.io/reporters
 

packages/server/lib/browsers/electron.coffee

@@ -93,7 +93,7 @@ getAutomation = (win) ->
             .then ->
               cookieToBeCleared
         when "is:automation:client:connected"
-          true
+          tryToCall(win, 'isDestroyed') == false
         when "take:screenshot"
           tryToCall(win, 'capturePage')
           .then _.partialRight(_.invoke, 'toDataURL')
@@ -194,16 +194,18 @@ module.exports = {
 
   _attachDebugger: (webContents) ->
     originalSendCommand = webContents.debugger.sendCommand
-
     webContents.debugger.sendCommand = (message, data = {}) ->
-      new Promise (resolve, reject) =>
-        debug('debugger: sending %s %o', message, data)
-
-        originalSendCommand.call webContents.debugger, message, data, (err, result) =>
-          debug("debugger: received response for %s: %o", message, { err, result })
-          if _.isEmpty(err)
-            return resolve(result)
-          reject(err)
+      debug('debugger: sending %s %o', message, data)
+
+      originalSendCommand
+      .call(webContents.debugger, message, data)
+      .then (result) =>
+        debug("debugger: received response for %s: result: %o", message, result)
+        result
+      .catch (err) =>
+        debug("debugger: received error on %s: result: %o", message, err)
+        throw err
+
     try
       webContents.debugger.attach()
       debug("debugger attached")
@@ -238,8 +240,7 @@ module.exports = {
 
   _clearCache: (webContents) ->
     debug("clearing cache")
-    Promise.fromCallback (cb) =>
-      webContents.session.clearCache(cb)
+    webContents.session.clearCache()
 
   _setUserAgent: (webContents, userAgent) ->
     debug("setting user agent to:", userAgent)
@@ -248,14 +249,13 @@ module.exports = {
     webContents.session.setUserAgent(userAgent)
 
   _setProxy: (webContents, proxyServer) ->
-    Promise.fromCallback (cb) =>
-      webContents.session.setProxy({
-        proxyRules: proxyServer
-        ## this should really only be necessary when
-        ## running Chromium versions >= 72
-        ## https://github.com/cypress-io/cypress/issues/1872
-        proxyBypassRules: "<-loopback>"
-      }, cb)
+    webContents.session.setProxy({
+      proxyRules: proxyServer
+      ## this should really only be necessary when
+      ## running Chromium versions >= 72
+      ## https://github.com/cypress-io/cypress/issues/1872
+      proxyBypassRules: "<-loopback>"
+    })
 
   open: (browser, url, options = {}, automation) ->
     { projectRoot, isTextTerminal } = options

packages/server/lib/gui/dialog.coffee

@@ -15,10 +15,7 @@ module.exports = {
       properties: ["openDirectory"]
     }
 
-    new Promise (resolve, reject) ->
-      dialog.showOpenDialog props, (paths = []) ->
-        process.nextTick ->
-          ## return the first path since there can only ever
-          ## be a single directory selection
-          resolve(paths[0])
+    dialog.showOpenDialog(props)
+    .then ({ filePaths }) ->
+      return filePaths[0]
 }

packages/server/lib/gui/windows.coffee

@@ -34,11 +34,10 @@ setWindowProxy = (win) ->
   if not process.env.HTTP_PROXY
     return
 
-  return new Promise (resolve) ->
-    win.webContents.session.setProxy({
-      proxyRules: process.env.HTTP_PROXY
-      proxyBypassRules: process.env.NO_PROXY
-    }, resolve)
+  win.webContents.session.setProxy({
+    proxyRules: process.env.HTTP_PROXY
+    proxyBypassRules: process.env.NO_PROXY
+  })
 
 module.exports = {
   reset: ->

packages/server/test/integration/cypress_spec.coffee

@@ -779,12 +779,12 @@ describe "lib/cypress", ->
           debugger: {
             on: sinon.stub()
             attach: sinon.stub()
-            sendCommand: sinon.stub().callsArg(2)
+            sendCommand: sinon.stub().resolves()
           }
           setUserAgent: sinon.stub()
           session: {
-            clearCache: sinon.stub().yieldsAsync()
-            setProxy: sinon.stub().yieldsAsync()
+            clearCache: sinon.stub().resolves()
+            setProxy: sinon.stub().resolves()
             setUserAgent: sinon.stub()
           }
         }

packages/server/test/unit/browsers/electron_spec.coffee

@@ -348,7 +348,7 @@ describe "lib/browsers/electron", ->
     it "sets proxy rules for webContents", ->
       webContents = {
         session: {
-          setProxy: sinon.stub().callsArg(1)
+          setProxy: sinon.stub().resolves()
         }
       }
 
@@ -366,6 +366,8 @@ describe "lib/browsers/electron", ->
       @sendCommand.throws()
       .withArgs('Browser.getVersion').resolves()
 
+      electron._attachDebugger(@win.webContents)
+
       @onRequest = electron._getAutomation(@win).onRequest
 
     describe "get:cookies", ->

packages/server/test/unit/gui/auth_spec.js

@@ -89,15 +89,17 @@ describe('lib/gui/auth', function () {
 
       it('returns a promise that is fulfilled when openExternal succeeds', function () {
         sinon.stub(electron.shell, 'openExternal').resolves()
+        const sendWarning = sinon.stub()
 
-        return auth._launchNativeAuth(REDIRECT_URL)
+        return auth._launchNativeAuth(REDIRECT_URL, sendWarning)
         .then(() => {
           expect(electron.shell.openExternal).to.be.calledWithMatch(REDIRECT_URL)
+          expect(sendWarning).to.not.be.called
         })
       })
 
       it('is still fulfilled when openExternal fails, but sendWarning is called', function () {
-        sinon.stub(electron.shell, 'openExternal').rejects()
+        sinon.stub(electron.shell, 'openExternal').rejects(new Error)
         const sendWarning = sinon.stub()
 
         return auth._launchNativeAuth(REDIRECT_URL, sendWarning)

packages/server/test/unit/gui/dialog_spec.coffee

@@ -7,7 +7,9 @@ Windows = require("#{root}../lib/gui/windows")
 describe "gui/dialog", ->
   context ".show", ->
     beforeEach ->
-      @showOpenDialog = electron.dialog.showOpenDialog = sinon.stub()
+      @showOpenDialog = electron.dialog.showOpenDialog = sinon.stub().resolves({
+        filePaths: []
+      })
 
     it "calls dialog.showOpenDialog with args", ->
       dialog.show()
@@ -16,13 +18,13 @@ describe "gui/dialog", ->
       })
 
     it "resolves with first path", ->
-      @showOpenDialog.yields(["foo", "bar"])
+      @showOpenDialog.resolves({
+        filePaths: ["foo", "bar"]
+      })
 
       dialog.show().then (ret) ->
         expect(ret).to.eq("foo")
 
     it "handles null paths", ->
-      @showOpenDialog.yields(null)
-
       dialog.show().then (ret) ->
         expect(ret).to.eq(undefined)

scripts/run-docker-local.sh

@@ -2,7 +2,7 @@ set e+x
 
 echo "This script should be run from cypress's root"
 
-name=cypress/browsers:node12.0.0-chrome73
+name=cypress/browsers:node12.4.0-chrome76
 echo "Pulling CI container $name"
 
 docker pull $name