Merge branch 'develop' into update-chrome-stable-from-120.0.6099.216-…

…beta-from-121.0.6167.47
cypress-io · Jan 12, 2024 · 03269d4 · 03269d4
2 parents f52506d + b19c1cd
commit 03269d4
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 59 deletions.
diff --git a/npm/eslint-plugin-dev/CHANGELOG.md b/npm/eslint-plugin-dev/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [@cypress/eslint-plugin-dev-v5.3.3](https://github.com/cypress-io/cypress/compare/@cypress/eslint-plugin-dev-v5.3.2...@cypress/eslint-plugin-dev-v5.3.3) (2024-01-12)
+
+
+### Bug Fixes
+
+* allow for versions greater than 4 for eslint-plugin-mocha to prevent force installing dependencies when eslint-plugin-mocha is bumbed in comsumer packages ([#27944](https://github.com/cypress-io/cypress/issues/27944)) ([bf05978](https://github.com/cypress-io/cypress/commit/bf0597847e71f34303364929f9c34cdd6c0e7ad8))
+
 # [@cypress/eslint-plugin-dev-v5.3.2](https://github.com/cypress-io/cypress/compare/@cypress/eslint-plugin-dev-v5.3.1...@cypress/eslint-plugin-dev-v5.3.2) (2022-08-15)
 
 

diff --git a/npm/webpack-dev-server/CHANGELOG.md b/npm/webpack-dev-server/CHANGELOG.md
@@ -1,3 +1,5 @@
+# [@cypress/webpack-dev-server-v3.7.3](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.7.2...@cypress/webpack-dev-server-v3.7.3) (2024-01-12)
+
 # [@cypress/webpack-dev-server-v3.7.2](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.7.1...@cypress/webpack-dev-server-v3.7.2) (2023-12-26)
 
 # [@cypress/webpack-dev-server-v3.7.1](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.7.0...@cypress/webpack-dev-server-v3.7.1) (2023-11-22)

diff --git a/packages/driver/cypress.config.ts b/packages/driver/cypress.config.ts
@@ -22,6 +22,15 @@ export default defineConfig({
     experimentalOriginDependencies: true,
     experimentalModifyObstructiveThirdPartyCode: true,
     setupNodeEvents: (on, config) => {
+      on('task', {
+        log (message) {
+          // eslint-disable-next-line no-console
+          console.log(message)
+
+          return null
+        },
+      })
+
       return require('./cypress/plugins')(on, config)
     },
     baseUrl: 'http://localhost:3500',

diff --git a/packages/driver/cypress/e2e/commands/task.cy.js b/packages/driver/cypress/e2e/commands/task.cy.js
@@ -234,7 +234,7 @@ describe('src/cy/commands/task', () => {
           expect(lastLog.get('error')).to.eq(err)
           expect(lastLog.get('state')).to.eq('failed')
 
-          expect(err.message).to.eq(`\`cy.task('bar')\` failed with the following error:\n\nThe task 'bar' was not handled in the setupNodeEvents method. The following tasks are registered: return:arg, return:foo, return:bar, return:baz, cypress:env, arg:is:undefined, wait, create:long:file, check:screenshot:size\n\nFix this in your setupNodeEvents method here:\n${Cypress.config('configFile')}`)
+          expect(err.message).to.eq(`\`cy.task('bar')\` failed with the following error:\n\nThe task 'bar' was not handled in the setupNodeEvents method. The following tasks are registered: log, return:arg, return:foo, return:bar, return:baz, cypress:env, arg:is:undefined, wait, create:long:file, check:screenshot:size\n\nFix this in your setupNodeEvents method here:\n${Cypress.config('configFile')}`)
 
           done()
         })

diff --git a/packages/driver/cypress/e2e/e2e/origin/snapshots.cy.ts b/packages/driver/cypress/e2e/e2e/origin/snapshots.cy.ts
@@ -66,63 +66,72 @@ describe('cy.origin - snapshots', { browser: '!webkit' }, () => {
         logs.set(attrs.id, log)
       })
 
+      cy.task('log', 'beforeEach before visit')
+
       cy.fixture('foo.bar.baz.json').then((fooBarBaz) => {
+        cy.task('log', 'beforeEach before intercept')
+
         cy.intercept('GET', '/foo.bar.baz.json', { body: fooBarBaz }).as('fooBarBaz')
       })
 
+      cy.task('log', 'beforeEach before visit')
+
       cy.visit('/fixtures/primary-origin.html')
+      cy.task('log', 'beforeEach before get')
+
       cy.get('a[data-cy="xhr-fetch-requests-onload"]').click()
+      cy.task('log', 'beforeEach after get')
     })
 
     // TODO: fix failing test: https://github.com/cypress-io/cypress/issues/23840
-    it.skip('verifies XHR requests made while a secondary origin is active eventually update with snapshots of the secondary origin', () => {
-      cy.origin('http://www.foobar.com:3500', () => {
-        // need to set isInteractive in the spec bridge in order to take xhr snapshots in run mode, similar to how isInteractive is set within support/defaults.js
-        // @ts-ignore
-        Cypress.config('isInteractive', true)
-        cy.visit('http://www.foobar.com:3500/fixtures/xhr-fetch-requests.html')
-        cy.get(`[data-cy="assertion-header"]`).should('exist')
-        cy.wait('@fooBarBaz')
-      })
+    // it.skip('verifies XHR requests made while a secondary origin is active eventually update with snapshots of the secondary origin', () => {
+    //   cy.origin('http://www.foobar.com:3500', () => {
+    //     // need to set isInteractive in the spec bridge in order to take xhr snapshots in run mode, similar to how isInteractive is set within support/defaults.js
+    //     // @ts-ignore
+    //     Cypress.config('isInteractive', true)
+    //     cy.visit('http://www.foobar.com:3500/fixtures/xhr-fetch-requests.html')
+    //     cy.get(`[data-cy="assertion-header"]`).should('exist')
+    //     cy.wait('@fooBarBaz')
+    //   })
 
-      cy.shouldWithTimeout(() => {
-        const xhrLogFromSecondaryOrigin = findLog(logs, 'xhr', 'http://localhost:3500/foo.bar.baz.json')?.get()
+    //   cy.shouldWithTimeout(() => {
+    //     const xhrLogFromSecondaryOrigin = findLog(logs, 'xhr', 'http://localhost:3500/foo.bar.baz.json')?.get()
 
-        expect(xhrLogFromSecondaryOrigin).to.exist
+    //     expect(xhrLogFromSecondaryOrigin).to.exist
 
-        const snapshots = xhrLogFromSecondaryOrigin.snapshots.map((snapshot) => snapshot.body.get()[0])
+    //     const snapshots = xhrLogFromSecondaryOrigin.snapshots.map((snapshot) => snapshot.body.get()[0])
 
-        expect(snapshots.length).to.equal(2)
+    //     expect(snapshots.length).to.equal(2)
 
-        // TODO: Since we have two events, one of them does not have a request snapshot
+    //     // TODO: Since we have two events, one of them does not have a request snapshot
 
-        expect(snapshots[1].querySelector(`[data-cy="assertion-header"]`)).to.have.property('innerText').that.equals('Making XHR and Fetch Requests behind the scenes if fireOnload is true!')
-      })
-    })
+    //     expect(snapshots[1].querySelector(`[data-cy="assertion-header"]`)).to.have.property('innerText').that.equals('Making XHR and Fetch Requests behind the scenes if fireOnload is true!')
+    //   })
+    // })
 
-    // TODO: fix failing test: https://github.com/cypress-io/cypress/issues/23840
-    it.skip('verifies fetch requests made while a secondary origin is active eventually update with snapshots of the secondary origin', () => {
-      cy.origin('http://www.foobar.com:3500', () => {
-        // need to set isInteractive in the spec bridge in order to take xhr snapshots in run mode, similar to how isInteractive is set within support/defaults.js
-        // @ts-ignore
-        Cypress.config('isInteractive', true)
-        cy.visit('http://www.foobar.com:3500/fixtures/xhr-fetch-requests.html')
-        cy.get(`[data-cy="assertion-header"]`).should('exist')
-        cy.wait('@fooBarBaz')
-      })
+    // // TODO: fix failing test: https://github.com/cypress-io/cypress/issues/23840
+    // it.skip('verifies fetch requests made while a secondary origin is active eventually update with snapshots of the secondary origin', () => {
+    //   cy.origin('http://www.foobar.com:3500', () => {
+    //     // need to set isInteractive in the spec bridge in order to take xhr snapshots in run mode, similar to how isInteractive is set within support/defaults.js
+    //     // @ts-ignore
+    //     Cypress.config('isInteractive', true)
+    //     cy.visit('http://www.foobar.com:3500/fixtures/xhr-fetch-requests.html')
+    //     cy.get(`[data-cy="assertion-header"]`).should('exist')
+    //     cy.wait('@fooBarBaz')
+    //   })
 
-      cy.shouldWithTimeout(() => {
-        const xhrLogFromSecondaryOrigin = findLog(logs, 'fetch', 'http://localhost:3500/foo.bar.baz.json')?.get()
+    //   cy.shouldWithTimeout(() => {
+    //     const xhrLogFromSecondaryOrigin = findLog(logs, 'fetch', 'http://localhost:3500/foo.bar.baz.json')?.get()
 
-        expect(xhrLogFromSecondaryOrigin).to.exist
+    //     expect(xhrLogFromSecondaryOrigin).to.exist
 
-        const snapshots = xhrLogFromSecondaryOrigin.snapshots.map((snapshot) => snapshot.body.get()[0])
+    //     const snapshots = xhrLogFromSecondaryOrigin.snapshots.map((snapshot) => snapshot.body.get()[0])
 
-        snapshots.forEach((snapshot) => {
-          expect(snapshot.querySelector(`[data-cy="assertion-header"]`)).to.have.property('innerText').that.equals('Making XHR and Fetch Requests behind the scenes if fireOnload is true!')
-        })
-      })
-    })
+    //     snapshots.forEach((snapshot) => {
+    //       expect(snapshot.querySelector(`[data-cy="assertion-header"]`)).to.have.property('innerText').that.equals('Making XHR and Fetch Requests behind the scenes if fireOnload is true!')
+    //     })
+    //   })
+    // })
 
     it('Does not take snapshots of XHR/fetch requests from secondary origin if the wrong origin is visited / origin mismatch, but instead the primary origin (existing behavior)', {
       defaultCommandTimeout: 50,
@@ -142,16 +151,29 @@ describe('cy.origin - snapshots', { browser: '!webkit' }, () => {
         done()
       })
 
+      cy.task('log', 'test before visit')
+
       cy.visit('http://www.foobar.com:3500/fixtures/xhr-fetch-requests.html')
 
+      cy.task('log', 'test after visit')
+
       cy.origin('http://www.barbaz.com:3500', () => {
         // need to set isInteractive in the spec bridge in order to take xhr snapshots in run mode, similar to how isInteractive is set within support/defaults.js
         // @ts-ignore
         Cypress.config('isInteractive', true)
 
+        cy.task('log', 'test before get')
+
         cy.get(`[data-cy="assertion-header"]`).should('exist')
+
+        cy.task('log', 'test after get')
+
         cy.wait('@fooBarBaz')
+
+        cy.task('log', 'test after wait')
       })
+
+      cy.task('log', 'test after origin')
     })
   })
 })
diff --git a/packages/frontend-shared/cypress/support/e2e.ts b/packages/frontend-shared/cypress/support/e2e.ts
@@ -369,7 +369,9 @@ function visitLaunchpad () {
   return logInternal(`visitLaunchpad ${Cypress.env('e2e_launchpadPort')}`, () => {
     return cy.visit(`/__launchpad/index.html`, { log: false }).then((val) => {
       return cy.get('[data-e2e]', { timeout: 10000, log: false }).then(() => {
-        return val
+        return cy.get('.spinner', { timeout: 10000, log: false }).should('not.exist').then(() => {
+          return val
+        })
       })
     })
   })

diff --git a/packages/launchpad/cypress/e2e/project-setup.cy.ts b/packages/launchpad/cypress/e2e/project-setup.cy.ts
@@ -615,7 +615,7 @@ describe('Launchpad: Setup Project', () => {
 
       cy.visitLaunchpad()
 
-      cy.get('[data-cy-testingtype="component"]').click()
+      cy.get('[data-cy-testingtype="component"]', { timeout: 10000 }).click()
       cy.get('[data-testid="select-framework"]').click()
       cy.findByText('Vue.js 3').click()
       cy.contains('button', 'Pick a bundler').click()

diff --git a/scripts/semantic-commits/get-binary-release-data.js b/scripts/semantic-commits/get-binary-release-data.js
@@ -2,10 +2,12 @@ const Bluebird = require('bluebird')
 const childProcess = require('child_process')
 const _ = require('lodash')
 const { Octokit } = require('@octokit/core')
+const debugLib = require('debug')
 
 const { getCurrentReleaseData } = require('./get-current-release-data')
 const { getNextVersionForBinary } = require('../get-next-version')
 const { getLinkedIssues } = require('./get-linked-issues')
+const debug = debugLib('scripts:semantic-commits:get-binary-release-data')
 
 const ensureAuth = () => {
   if (!process.env.GH_TOKEN) {
@@ -80,8 +82,6 @@ const fetchPullRequest = async (octokit, pullNumber) => {
 
     return pullRequest
   } catch (err) {
-    console.log(`Error while fetching PR #${pullNumber}:`, err)
-
     const { rateLimitHit, retryAfter } = parseRateLimit(err)
 
     if (rateLimitHit) {
@@ -133,29 +133,54 @@ const getReleaseData = async (latestReleaseInfo) => {
       return
     }
 
-    const ref = references.find((r) => !r.raw.includes('revert #'))
+    const refs = references.filter((r) => !r.raw.includes('revert #'))
 
-    if (!ref) {
+    if (!refs.length) {
       console.log('Commit does not have an associated pull request number...')
 
       return
     }
 
-    const pullRequest = await fetchPullRequest(octokit, ref.issue)
-    const associatedIssues = pullRequest.body ? getLinkedIssues(pullRequest.body) : []
-
-    commits.push({
-      commitMessage: semanticResult.header,
-      semanticType,
-      prNumber: ref.issue,
-      associatedIssues,
-    })
-
-    prsInRelease.push(`https://github.com/cypress-io/cypress/pull/${ref.issue}`)
-
-    associatedIssues.forEach((issueNumber) => {
-      issuesInRelease.push(`https://github.com/cypress-io/cypress/issues/${issueNumber}`)
-    })
+    for (const [idx, ref] of refs.entries()) {
+      let pullRequest
+
+      try {
+        pullRequest = await fetchPullRequest(octokit, ref.issue)
+        debug(`Pull request #${ref.issue} found!`)
+      } catch (err) {
+        debug(`Error while fetching PR #${ ref.issue}:`, err)
+        // If we have tried to fetch all other references and all of them failed,
+        // print the failure of the last reference and exit
+        if (idx === refs.length) {
+          debug(`all references exhausted and no PR could be found!`)
+          console.log(`Error while fetching PR #${ ref.issue}:`, err)
+          throw err
+        } else {
+          // otherwise, we still might be able to link a PR to the commit
+          debug(`Other references need to be tried. Continuing to see if we can find a corresponding pull request.`)
+        }
+
+        continue
+      }
+
+      const associatedIssues = pullRequest.body ? getLinkedIssues(pullRequest.body) : []
+
+      commits.push({
+        commitMessage: semanticResult.header,
+        semanticType,
+        prNumber: ref.issue,
+        associatedIssues,
+      })
+
+      prsInRelease.push(`https://github.com/cypress-io/cypress/pull/${ref.issue}`)
+
+      associatedIssues.forEach((issueNumber) => {
+        issuesInRelease.push(`https://github.com/cypress-io/cypress/issues/${issueNumber}`)
+      })
+
+      // since we found our pull request, we don't need to check the rest of the references
+      break
+    }
   }))
 
   console.log('Next release version is', nextVersion)