chore(deps): Updating electron to v18 + node v16.13.2 (#21418)

* chore: Updating electron to v18 + node v16.13.2

* Updating origin test, it needs to be fixed a different way

* Removing origin workaround for config_env specs, it should not be necessary.

* Removing now-unused semver dependency

Author: tbiethman

.node-version

@@ -1 +1 @@
-16.5.0
+16.13.2

circle.yml

@@ -39,6 +39,7 @@ macWorkflowFilters: &mac-workflow-filters
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ check-results-for-env, << pipeline.git.branch >> ]
+    - equal: [ tbiethman/chore/electron-18-update, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -49,6 +50,7 @@ windowsWorkflowFilters: &windows-workflow-filters
     - equal: [ master, << pipeline.git.branch >> ]
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ check-results-for-env, << pipeline.git.branch >> ]
+    - equal: [ tbiethman/chore/electron-18-update, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -60,7 +62,7 @@ executors:
   # the Docker image with Cypress dependencies and Chrome browser
   cy-doc:
     docker:
-      - image: cypress/browsers:node16.5.0-chrome94-ff93
+      - image: cypress/browsers:node16.13.2-chrome100-ff98
     # by default, we use "small" to save on CI costs. bump on a per-job basis if needed.
     resource_class: small
     environment:
@@ -69,7 +71,7 @@ executors:
   # Docker image with non-root "node" user
   non-root-docker-user:
     docker:
-      - image: cypress/browsers:node16.5.0-chrome94-ff93
+      - image: cypress/browsers:node16.13.2-chrome100-ff98
         user: node
     environment:
       PLATFORM: linux
@@ -371,8 +373,10 @@ commands:
             npm install yarn -g # ensure yarn is installed with the correct node engine
             yarn check-node-version
       - run:
-          name: Check  Node
-          command: yarn check-node-version
+          name: Check Node
+          command: |
+            [ -s "${HOME}/.nvm/nvm.sh" ] && \. "${HOME}/.nvm/nvm.sh"
+            yarn check-node-version
 
   install-chrome:
     description: Install Google Chrome
@@ -589,7 +593,11 @@ commands:
         ## by default, assert that at least 1 test ran
         default: 0
     steps:
-      - run: yarn verify:mocha:results <<parameters.expectedResultCount>>
+      - run: 
+          name: 'Verify Mocha Results'
+          command: |
+            [ -s "${HOME}/.nvm/nvm.sh" ] && \. "${HOME}/.nvm/nvm.sh"
+            yarn verify:mocha:results <<parameters.expectedResultCount>>
 
   clone-repo-and-checkout-release-branch:
     description: |
@@ -896,7 +904,9 @@ commands:
             yarn binary-build --platform $PLATFORM --version $(node ./scripts/get-next-version.js)
       - run:
           name: Zip the binary
-          command: yarn binary-zip --platform $PLATFORM
+          command: |
+            apt-get update && apt-get install -y zip
+            yarn binary-zip --platform $PLATFORM
       - store-npm-logs
       - persist_to_workspace:
           root: ~/
@@ -1247,7 +1257,7 @@ jobs:
 
   runner-integration-tests-firefox:
     <<: *defaults
-    resource_class: medium
+    resource_class: medium+
     parallelism: 2
     steps:
       - run-runner-integration-tests:

cli/test/lib/util_spec.js

@@ -267,7 +267,7 @@ describe('util', () => {
     })
 
     it('copy NODE_OPTIONS to ORIGINAL_NODE_OPTIONS', () => {
-      sandbox.stub(process.versions, 'node').value('v16.5.0')
+      sandbox.stub(process.versions, 'node').value('v16.13.2')
       sandbox.stub(process.versions, 'openssl').value('1.0.0')
 
       restoreEnv = mockedEnv({
@@ -322,7 +322,7 @@ describe('util', () => {
 
     // https://github.com/cypress-io/cypress/issues/18914
     it('does not include --openssl-legacy-provider in Node <=16', () => {
-      sandbox.stub(process.versions, 'node').value('v16.5.0')
+      sandbox.stub(process.versions, 'node').value('v16.13.2')
       sandbox.stub(process.versions, 'openssl').value('1.0.0')
 
       restoreEnv = mockedEnv({})

package.json

@@ -169,7 +169,7 @@
     "yarn-deduplicate": "3.1.0"
   },
   "engines": {
-    "node": ">=16.5.0",
+    "node": ">=16.13.2",
     "yarn": ">=1.17.3"
   },
   "productName": "Cypress",

packages/driver/cypress/fixtures/dom.html

@@ -114,6 +114,10 @@
           width: 60px;
         }
 
+        /* normalizing li height across supported browsers */
+        li {
+          height: 18px;
+        }
       </style>
 
       DOM Fixture

packages/driver/cypress/integration/commands/actions/trigger_spec.js

@@ -589,13 +589,10 @@ describe('src/cy/commands/actions/trigger', () => {
       })
 
       it('passes options.animationDistanceThreshold to cy.ensureElementIsNotAnimating', () => {
-        const $btn = cy.$$('button:first')
-
-        const { fromElWindow } = Cypress.dom.getElementCoordinatesByPosition($btn)
-
         cy.spy(cy, 'ensureElementIsNotAnimating')
 
-        cy.get('button:first').trigger('tap', { animationDistanceThreshold: 1000 }).then(() => {
+        cy.get('button:first').trigger('tap', { animationDistanceThreshold: 1000 }).then(($btn) => {
+          const { fromElWindow } = Cypress.dom.getElementCoordinatesByPosition($btn)
           const { args } = cy.ensureElementIsNotAnimating.firstCall
 
           expect(args[1]).to.deep.eq([fromElWindow, fromElWindow])
@@ -606,13 +603,10 @@ describe('src/cy/commands/actions/trigger', () => {
       it('passes config.animationDistanceThreshold to cy.ensureElementIsNotAnimating', () => {
         const animationDistanceThreshold = Cypress.config('animationDistanceThreshold')
 
-        const $btn = cy.$$('button:first')
-
-        const { fromElWindow } = Cypress.dom.getElementCoordinatesByPosition($btn)
-
         cy.spy(cy, 'ensureElementIsNotAnimating')
 
-        cy.get('button:first').trigger('mouseover').then(() => {
+        cy.get('button:first').trigger('mouseover').then(($btn) => {
+          const { fromElWindow } = Cypress.dom.getElementCoordinatesByPosition($btn)
           const { args } = cy.ensureElementIsNotAnimating.firstCall
 
           expect(args[1]).to.deep.eq([fromElWindow, fromElWindow])

packages/driver/cypress/integration/commands/actions/type_spec.js

@@ -351,13 +351,10 @@ describe('src/cy/commands/actions/type - #type', () => {
     })
 
     it('passes options.animationDistanceThreshold to cy.ensureElementIsNotAnimating', () => {
-      const $txt = cy.$$(':text:first')
-
-      const { fromElWindow } = Cypress.dom.getElementCoordinatesByPosition($txt)
-
       cy.spy(cy, 'ensureElementIsNotAnimating')
 
-      cy.get(':text:first').type('foo', { animationDistanceThreshold: 1000 }).then(() => {
+      cy.get(':text:first').type('foo', { animationDistanceThreshold: 1000 }).then(($txt) => {
+        const { fromElWindow } = Cypress.dom.getElementCoordinatesByPosition($txt)
         const { args } = cy.ensureElementIsNotAnimating.firstCall
 
         expect(args[1]).to.deep.eq([fromElWindow, fromElWindow])
@@ -369,13 +366,10 @@ describe('src/cy/commands/actions/type - #type', () => {
     it('passes config.animationDistanceThreshold to cy.ensureElementIsNotAnimating', () => {
       const animationDistanceThreshold = Cypress.config('animationDistanceThreshold')
 
-      const $txt = cy.$$(':text:first')
-
-      const { fromElWindow } = Cypress.dom.getElementCoordinatesByPosition($txt)
-
       cy.spy(cy, 'ensureElementIsNotAnimating')
 
-      cy.get(':text:first').type('foo').then(() => {
+      cy.get(':text:first').type('foo').then(($txt) => {
+        const { fromElWindow } = Cypress.dom.getElementCoordinatesByPosition($txt)
         const { args } = cy.ensureElementIsNotAnimating.firstCall
 
         expect(args[1]).to.deep.eq([fromElWindow, fromElWindow])

packages/driver/cypress/integration/e2e/origin/commands/navigation.spec.ts

@@ -22,9 +22,18 @@ context('cy.origin navigation', () => {
     cy.get('a[data-cy="dom-link"]').click()
 
     cy.origin('http://foobar.com:3500', () => {
-      cy.get(':checkbox[name="colors"][value="blue"]').check().should('be.checked')
+      cy.window().then((localWindow) => {
+        // Define a custom property on window that we can assert the presence of.
+        // After reloading, this property should not exist.
+        // @ts-ignore
+        localWindow.cy_testCustomValue = true
+      })
+
+      cy.window().should('have.prop', 'cy_testCustomValue', true)
+
       cy.reload()
-      cy.get(':checkbox[name="colors"][value="blue"]').should('not.be.checked')
+
+      cy.window().should('not.have.prop', 'cy_testCustomValue', true)
     })
   })
 

packages/driver/cypress/integration/e2e/origin/commands/spies_stubs_clocks.spec.ts

@@ -6,6 +6,16 @@ context('cy.origin spies, stubs, and clock', () => {
     cy.get('a[data-cy="cross-origin-secondary-link"]').click()
   })
 
+  afterEach(() => {
+    // FIXME: Tests that end with a cy.origin command and enqueue no further cy
+    // commands may have origin's unload event bleed into subsequent tests
+    // and prevent stability from being reached, causing those tests to hang.
+    // We enqueue another cy command after each test to ensure stability
+    // is reached for the next test. This additional command can be removed with the
+    // completion of: https://github.com/cypress-io/cypress/issues/21300
+    cy.then(() => { /* ensuring stability */ })
+  })
+
   it('spy()', () => {
     cy.origin('http://foobar.com:3500', () => {
       const foo = { bar () { } }

packages/driver/cypress/integration/e2e/origin/commands/unsupported_commands.spec.ts

@@ -4,6 +4,16 @@ context('cy.origin unsupported commands', () => {
     cy.get('a[data-cy="cross-origin-secondary-link"]').click()
   })
 
+  afterEach(() => {
+    // FIXME: Tests that end with a cy.origin command and enqueue no further cy
+    // commands may have origin's unload event bleed into subsequent tests
+    // and prevent stability from being reached, causing those tests to hang.
+    // We enqueue another cy command after each test to ensure stability
+    // is reached for the next test. This additional command can be removed with the
+    // completion of: https://github.com/cypress-io/cypress/issues/21300
+    cy.then(() => { /* ensuring stability */ })
+  })
+
   it('cy.route() method is deprecated', (done) => {
     cy.on('fail', (err) => {
       expect(err.message).to.equal('`cy.route()` has been deprecated and its use is not supported in the `cy.origin()` callback. Consider using `cy.intercept()` (outside of the callback) instead.')