PR comments

.eslintignore

@@ -34,7 +34,7 @@ system-tests/projects/e2e/cypress/integration/typescript_syntax_error_spec.ts
 
 # cli/types is linted by tslint/dtslint
 cli/types
-# packages/config/lib is compiles code
+# packages/config/lib is compiled code
 packages/config/lib
 # packages/example is not linted (think about changing this)
 packages/example

.vscode/extensions.json

@@ -1,6 +1,8 @@
 {
 	// To see these extensions in VS Code:
-	// 1. Open the Command Palette (Cmd+Shift+P)
+	// 1. Open the Command Palette:
+	//      - Non-Mac Users: (Ctrl+Shift+P)
+	//      - Mac Users: (Cmd+Shift+P)
 	// 2. Select "Extensions: Show Recommended Extensions"
 
 	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.

package.json

@@ -46,7 +46,7 @@
     "stop-only": "npx stop-only --skip .cy,.publish,.projects,node_modules,dist,dist-test,fixtures,lib,bower_components,src,__snapshots__ --exclude e2e.ts,cypress-tests.ts",
     "stop-only-all": "yarn stop-only --folder packages",
     "pretest": "yarn ensure-deps",
-    "test": "yarn lerna exec yarn test --scope cypress --scope \"'@packages/{electron,extension,https-proxy,launcher,net-stubbing,network,proxy,rewriter,runner,runner-shared,socket}'\"",
+    "test": "yarn lerna exec yarn test --scope cypress --scope \"'@packages/{config,electron,extension,https-proxy,launcher,net-stubbing,network,proxy,rewriter,runner,runner-shared,socket}'\"",
     "test-debug": "lerna exec yarn test-debug --ignore \"'@packages/{desktop-gui,driver,root,static,web-config}'\"",
     "pretest-e2e": "yarn ensure-deps",
     "test-integration": "lerna exec yarn test-integration --ignore \"'@packages/{desktop-gui,driver,root,static,web-config}'\"",

packages/config/__snapshots__/index_spec.js

@@ -51,6 +51,7 @@ exports['src/index .getDefaultValues returns list of public config keys 1'] = {
   },
   "screenshotOnRunFailure": true,
   "screenshotsFolder": "cypress/screenshots",
+  "slowTestThreshold": 10000,
   "scrollBehavior": "top",
   "supportFile": "cypress/support",
   "supportFolder": false,
@@ -122,6 +123,7 @@ exports['src/index .getPublicConfigKeys returns list of public config keys 1'] =
   "retries",
   "screenshotOnRunFailure",
   "screenshotsFolder",
+  "slowTestThreshold",
   "scrollBehavior",
   "supportFile",
   "supportFolder",

packages/config/test/unit/index_spec.js

@@ -40,11 +40,11 @@ describe('src/index', () => {
 
       expect(defaultValues).to.deep.include({
         defaultCommandTimeout: 4000,
-        env: {},
         scrollBehavior: 'top',
         watchForFileChanges: true,
       })
 
+      expect(defaultValues.env).to.deep.eq({})
       snapshot(defaultValues)
     })
   })

packages/driver/cypress/integration/commands/navigation_spec.js

@@ -1981,41 +1981,53 @@ describe('src/cy/commands/navigation', () => {
         return null
       })
 
-      it('can time out', function (done) {
-        let thenCalled = false
+      describe('can time out', () => {
+        let pageLoadTimeout
 
-        cy.on('fail', (err) => {
-          const { lastLog } = this
+        before(() => {
+          pageLoadTimeout = Cypress.config().pageLoadTimeout
+        })
 
-          // visit, window, page loading
-          expect(this.logs.length).to.eq(3)
-          expect(err.message).to.include('Your page did not fire its `load` event within `50ms`.')
-          expect(lastLog.get('name')).to.eq('page load')
-          expect(lastLog.get('error')).to.eq(err)
+        after(() => {
+          Cypress.config('pageLoadTimeout', pageLoadTimeout)
+        })
 
-          return Promise
-          .delay(100)
-          .then(() => {
-            expect(cy.state('onPageLoadErr')).to.be.null
-            expect(cy.isStopped()).to.be.true // make sure we ran our cleanup routine
-            expect(thenCalled).to.be.false
+        it('times out', function (done) {
+          let thenCalled = false
 
-            done()
+          cy.on('fail', (err) => {
+            const { lastLog } = this
+
+            // visit, window, page loading
+            expect(this.logs.length).to.eq(3)
+            expect(err.message).to.include('Your page did not fire its `load` event within `50ms`.')
+            expect(lastLog.get('name')).to.eq('page load')
+            expect(lastLog.get('error')).to.eq(err)
+
+            return Promise
+            .delay(100)
+            .then(() => {
+              expect(cy.state('onPageLoadErr')).to.be.null
+              expect(cy.isStopped()).to.be.true // make sure we ran our cleanup routine
+              expect(thenCalled).to.be.false
+
+              done()
+            })
           })
-        })
 
-        cy
-        .visit('/fixtures/jquery.html')
-        .window().then((win) => {
-          Cypress.config('pageLoadTimeout', 50)
-          const $a = win.$('<a href=\'/timeout?ms=500\'>jquery</a>')
-          .appendTo(win.document.body)
+          cy
+          .visit('/fixtures/jquery.html')
+          .window().then((win) => {
+            Cypress.config('pageLoadTimeout', 50)
+            const $a = win.$('<a href=\'/timeout?ms=500\'>jquery</a>')
+            .appendTo(win.document.body)
 
-          causeSynchronousBeforeUnload($a)
+            causeSynchronousBeforeUnload($a)
 
-          return null
-        }).wrap(null).then(() => {
-          thenCalled = true
+            return null
+          }).wrap(null).then(() => {
+            thenCalled = true
+          })
         })
       })
 

packages/driver/src/cypress/error_messages.ts

@@ -251,7 +251,7 @@ export default {
       docsUrl: 'https://on.cypress.io/config',
     },
     'invalid_test_override': {
-      message: `The config overrides passed to your test has the following validation error:\n\n{{errMsg}}`,
+      message: `The config override passed to your test has the following validation error:\n\n{{errMsg}}`,
       docsUrl: 'https://on.cypress.io/config',
     },
   },