mirror of
https://github.com/cypress-io/cypress.git
synced 2026-01-08 07:29:44 -06:00
feat(deps): update dependency electron to version 11.0.2 🌟 (#9222)
Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Zach Bloomquist <github@chary.us>
This commit is contained in:
@@ -1 +1 @@
|
||||
12.14.1
|
||||
12.18.3
|
||||
|
||||
@@ -8,7 +8,7 @@ branches:
|
||||
# https://www.appveyor.com/docs/lang/nodejs-iojs/
|
||||
environment:
|
||||
# use matching version of Node.js
|
||||
nodejs_version: "12.14.1"
|
||||
nodejs_version: "12.18.3"
|
||||
# encode secure variables which will NOT be used
|
||||
# in pull requests
|
||||
# https://www.appveyor.com/docs/build-configuration/#secure-variables
|
||||
|
||||
@@ -45,14 +45,14 @@ executors:
|
||||
# the Docker image with Cypress dependencies and Chrome browser
|
||||
cy-doc:
|
||||
docker:
|
||||
- image: cypress/browsers:node12.14.1-chrome83-ff77
|
||||
- image: cypress/browsers:node12.18.3-chrome83-ff77
|
||||
environment:
|
||||
PLATFORM: linux
|
||||
|
||||
# Docker image with non-root "node" user
|
||||
non-root-docker-user:
|
||||
docker:
|
||||
- image: cypress/browsers:node12.14.1-chrome83-ff77
|
||||
- image: cypress/browsers:node12.18.3-chrome83-ff77
|
||||
user: node
|
||||
environment:
|
||||
PLATFORM: linux
|
||||
|
||||
@@ -196,7 +196,7 @@
|
||||
"typescript": "3.7.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12.14.1",
|
||||
"node": ">=12.18.3",
|
||||
"yarn": ">=1.17.3"
|
||||
},
|
||||
"productName": "Cypress",
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"minimist": "1.2.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron": "10.1.5",
|
||||
"electron": "11.0.2",
|
||||
"execa": "4.1.0",
|
||||
"mocha": "3.5.3"
|
||||
},
|
||||
|
||||
@@ -103,7 +103,16 @@ describe('Proxy', () => {
|
||||
expect(res.socket.destroyed).to.be.true
|
||||
// ensure the outgoing socket created for this connection was destroyed
|
||||
expect(net.connect).calledOnce
|
||||
expect(net.connect.getCalls()[0].returnValue.destroyed).to.be.true
|
||||
|
||||
const socket = net.connect.getCalls()[0].returnValue
|
||||
|
||||
return new Promise((resolve) => {
|
||||
socket.on('close', () => {
|
||||
expect(socket.destroyed).to.be.true
|
||||
|
||||
resolve()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@@ -121,6 +121,9 @@ module.exports = {
|
||||
y: 'browserY',
|
||||
devTools: 'isBrowserDevToolsOpen',
|
||||
},
|
||||
webPreferences: {
|
||||
sandbox: true,
|
||||
},
|
||||
onFocus () {
|
||||
if (options.show) {
|
||||
return menu.set({ withDevTools: true })
|
||||
|
||||
@@ -135,6 +135,8 @@ export function defaults (options = {}) {
|
||||
partition: null,
|
||||
webSecurity: true,
|
||||
nodeIntegration: false,
|
||||
// TODO: enable contextIsolation for Cypress browser (default in Electron 12)
|
||||
contextIsolation: false,
|
||||
backgroundThrottling: false,
|
||||
},
|
||||
})
|
||||
@@ -209,6 +211,7 @@ export function create (projectRoot, _options: WindowOptions = {}, newBrowserWin
|
||||
return win
|
||||
}
|
||||
|
||||
// open desktop-gui BrowserWindow
|
||||
export function open (projectRoot, options: WindowOptions = {}, newBrowserWindow = _newBrowserWindow) {
|
||||
// if we already have a window open based
|
||||
// on that type then just show + focus it!
|
||||
|
||||
@@ -3,7 +3,7 @@ set e+x
|
||||
|
||||
echo "This script should be run from cypress's root"
|
||||
|
||||
name=cypress/browsers:node12.14.1-chrome83-ff77
|
||||
name=cypress/browsers:node12.18.3-chrome83-ff77
|
||||
echo "Pulling CI container $name"
|
||||
|
||||
docker pull $name
|
||||
|
||||
@@ -12984,10 +12984,10 @@ electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromi
|
||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz#2e70234484e03d7c7e90310d7d79fd3775379c34"
|
||||
integrity sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==
|
||||
|
||||
electron@10.1.5:
|
||||
version "10.1.5"
|
||||
resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.5.tgz#f2b161310f627063e73fbac44efcb35dece83a90"
|
||||
integrity sha512-fys/KnEfJq05TtMij+lFvLuKkuVH030CHYx03iZrW5DNNLwjE6cW3pysJ420lB0FRSfPjTHBMu2eVCf5TG71zQ==
|
||||
electron@11.0.2:
|
||||
version "11.0.2"
|
||||
resolved "https://registry.yarnpkg.com/electron/-/electron-11.0.2.tgz#c7bd2b9abdc1446f4578dbfa22573014b6b2df58"
|
||||
integrity sha512-FTYtCm0oj8B8EJhp99BQSW2bd40xYEG/txMj+W3Ed0CNu5zVIIXb5WIrhXLvhcasN5LKy9nkmSZ+u220lCaARg==
|
||||
dependencies:
|
||||
"@electron/get" "^1.0.1"
|
||||
"@types/node" "^12.0.12"
|
||||
|
||||
Reference in New Issue
Block a user