Skip to content

Commit 6ba8d7c

Browse files
chrisbreidingflotwigbrian-mann
committed
Electron v5.0.10 (#4720)
* fix specs * use debugger protocol for cookie handling in electron * use latest gulp * use rimraf instead of gulp-clean * use electron 3.1.8 and node 10.2.1 * use gulp 4 in packages/static * fix sendCommandAsync, log Schema.getDomains on CDP connect * autofill e2e test name [skip ci] * [email protected], see what new failures exist * --no-sandbox for launching Electron * update cookies logic for electron * node 12 * update snapshot for new node * update error message for new node * stub sendCommandAsync * only connect to socket if path has been replaced, fixes #4776 * update node-sass to support node 12 * skip wacky socket tests for now * snapshot * fix run_plugins_spec snapshot, don't include stack trace * use --no-sandbox on linux to run as root * allow sendCommandAsync to resolve * use euid for root check * log domains even if undefined * don't worry about ending 1xx responses immediately anymore * use --max-http-header-size, change max size from 8kb to 1mb, fix #76 * do not send 502 on failed websocket, just send back ECONNRESET * update websocket spec port to not collide with other test * update outdated expect * Revert "only connect to socket if path has been replaced, fixes #4776" This reverts commit f179eda. * update gulp in root * update https-proxy unit tests * update network spec to properly close server * update reporter spec * update https-proxy-agent to fix node 10.10.0 change discussion: https://github.com/nodejs/node/issues/24474\#issuecomment-511963799 * only pass --max-http-header-size on node >=12 * use own server-destroy implementation that supports secureConnect events * oops * update socket_spec * electron 6.0.0 * console.table introduced in node 10 * change browserify entry to init.js * handle edge case when no response body * console.table added in node 10 * do not exit app when all BrowserWindows are closed * update e2e snapshots * value may not be null * update plugins spec * correct cookie expiry, use browser.getversion for CDP version check * fix snapshotting for require stacks * reorder cookies in spec * warn when depreated electron callback apis are used * only report 1 plugin error per process * cleanup * node 12.4.0, cypress/browsers:node12.4.0-chrome76 docker image * update shell.openExternal to promisified * update dialog.showOpenDialog to promisified * update webContents.session.setProxy to promisified * updating native dependencies since we don't need ancient node ABI support anymore * WIP: switch cookies to simpler, jar-less approach * WIP: switch cookies to simpler, jar-less approach * making tests pass * improve cookie filtering logic * Remove unneeded Promise.try * filter what makes it to the extension * properly re-set superdomain cookies on cross-origin cy.visit * allow comma-separated list of e2e tests * sort cookies in order of expiration date, ascending * updating tests, cleanup * update tests * version electron as a devDependency, [email protected] * cleanup, remove old automation * cleanup, remove old automation * bump chokidar to fix win10 + node12 issue was seeing this on windows: nuxt/nuxt#6035 fixed with version bump * enable now-supported quit role, re-enable old tests * don't need that arg there * remove last deprecated callback electron invocations * Delete cypress.json * responding to PR feedback * cleanup * invoke * use 'quit' role * Use new appMenu role for Cypress menu on mac * [email protected] * [email protected] * remove domain: cookie.domain and see what happens * remove setErrorHandler * Revert "remove domain: cookie.domain and see what happens" This reverts commit 49e9168. * add unit tests for cookies * ci * fix project-content css * [email protected] * fix specs_list test * [email protected] * some cleanup * [email protected] * Update 8_reporters_spec.coffee.js * [email protected] - Chromium 73, Node 12 * cli: fix the STDIN pipe on Windows (#5045) * cli: pipe stdin * uggh, here is the actual change * update cli unit tests * add unit test * more permissive check for json to include application/vnd.api+j… (#5166) * more permissive check for json to include * add json test for content-type application/vnd.api+json * cruder solution passes e2e tests locally, so let's go with that * Remove 'charset' from content-type before checking if JSON * fix eslint for fixture specs (#5176) * update eslint to lint files within 'fixtures' in support files - ignore some edge cases like jquery, jsx and obvious js files we wrote with broken code * Fixes from eslint to 'fixtures' files * Catch env variable with reserved name CYPRESS_ENV 1621 (#1626) * server: check CYPRESS_ENV variable when merging configs * catch invalid CYPRESS_ENV value in CLI, close #1621 * linting * sanitize platform in test snapshot * linting * update error message text * add missing comma * fix finally merge in JS code * pass CLI linter * fix log reference, should be debug * use correct sinon reference * update message, show first part in red * update error message text * Addresses #2953 (#5174) * Addresses #2953 * Added proper test for new error message * Didn't realize it ran this test as well, whoops * Implementing changes as suggested by @jennifer-shehane * Fixing tests and error output. Moved the checks to the start of the get command to ensure we always catch improper options * Removing issue test since the querying spec covers it * Using coffescript isArray check * depromisify things that were promisified b/t electron 5 <=> 6 Revert "update shell.openExternal to promisified" This reverts commit 8b6460d. Revert "update dialog.showOpenDialog to promisified" This reverts commit 5f178b0. Revert "update webContents.session.setProxy to promisified" This reverts commit 727df3a. * node12.4.0-chrome76 => node12.0.0-chrome75 * fix tests for electron downgrade * node12.0.0-chrome75 => node12.0.0-chrome73 Co-authored-by: Zach Bloomquist <[email protected]> Co-authored-by: Brian Mann <[email protected]>
1 parent 01c3514 commit 6ba8d7c

File tree

79 files changed

+1151
-1166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1151
-1166
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Cached Theme Material Design.pak
2222
packages/https-proxy/ca/
2323

2424
# from desktop-gui
25+
packages/desktop-gui/cypress/videos
2526
packages/desktop-gui/src/jsconfig.json
2627

2728
# from driver
@@ -32,9 +33,6 @@ packages/example/app
3233
packages/example/build
3334
packages/example/cypress
3435

35-
# from driver
36-
packages/driver/test/cypress/videos
37-
3836
# from server
3937
packages/server/.cy
4038
packages/server/.projects

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.9.3
1+
12.4.0

.vscode/terminals.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"onlySingle": true,
3030
"execute": false,
3131
"cwd": "[cwd]/packages/server",
32-
"command": "npm run test-e2e -- --spec name"
32+
"command": "npm run test-e2e -- --spec [fileBasename]"
3333
},
3434
{
3535
"name": "packages/runner watch",

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ branches:
77
# https://www.appveyor.com/docs/lang/nodejs-iojs/
88
environment:
99
# use matching version of Node.js
10-
nodejs_version: "8.9.3"
10+
nodejs_version: "12.4.0"
1111
# encode secure variables which will NOT be used
1212
# in pull requests
1313
# https://www.appveyor.com/docs/build-configuration/#secure-variables

circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ executors:
2323
# the Docker image with Cypress dependencies and Chrome browser
2424
cy-doc:
2525
docker:
26-
- image: cypress/browsers:node8.9.3-npm6.10.1-chrome75
26+
- image: cypress/browsers:node12.0.0-chrome73
2727
environment:
2828
PLATFORM: linux
2929

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
"cloudflare-cli": "3.2.2",
103103
"coffeelint": "1.16.2",
104104
"common-tags": "1.8.0",
105-
"console.table": "0.10.0",
106105
"debug": "4.1.1",
107106
"decaffeinate": "6.0.1",
108107
"del": "3.0.0",
@@ -161,7 +160,7 @@
161160
"vinyl-paths": "2.1.0"
162161
},
163162
"engines": {
164-
"node": ">=8.9.3"
163+
"node": "12.4.0"
165164
},
166165
"productName": "Cypress",
167166
"license": "MIT",

packages/desktop-gui/cypress/integration/login_spec.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ describe('Login', function () {
1818
cy.stub(this.ipc, 'openProject').resolves(this.config)
1919
cy.stub(this.ipc, 'getSpecs').yields(null, this.specs)
2020
cy.stub(this.ipc, 'externalOpen')
21-
cy.stub(this.ipc, 'clearGithubCookies')
2221
cy.stub(this.ipc, 'logOut').resolves()
2322

2423
cy.stub(this.ipc, 'onAuthMessage').callsFake((function (_this) {
@@ -124,14 +123,6 @@ describe('Login', function () {
124123
cy.get('.nav').contains('Log In')
125124
})
126125

127-
it('calls clear:github:cookies', function () {
128-
cy.get('nav a').contains('Jane').click()
129-
130-
cy.contains('Log Out').click().then(function () {
131-
expect(this.ipc.clearGithubCookies).to.be.called
132-
})
133-
})
134-
135126
it('calls log:out', function () {
136127
cy.get('nav a').contains('Jane').click()
137128

packages/desktop-gui/src/auth/auth-api.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class AuthApi {
3939
logOut () {
4040
authStore.setUser(null)
4141

42-
ipc.clearGithubCookies()
4342
ipc.logOut()
4443
.catch((err) => {
4544
err.name = 'An unexpected error occurred while logging out'

packages/desktop-gui/src/lib/ipc.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ const ipc = {
1111
handleUnauthed () {
1212
authStore.setUser(null)
1313

14-
ipc.clearGithubCookies()
1514
ipc.logOut()
1615
},
1716
}
@@ -32,7 +31,6 @@ const register = (eventName, isPromiseApi = true) => {
3231
register('add:project')
3332
register('begin:auth')
3433
register('on:auth:message', false)
35-
register('clear:github:cookies')
3634
register('close:browser')
3735
register('close:project')
3836
register('external:open')

packages/desktop-gui/src/project/project.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
flex-grow: 2;
55
margin-bottom: 0;
66
width: 100%;
7+
min-height: 0;
78
}

0 commit comments

Comments
 (0)