Merge branch 'develop' into cacie/dep/electron-27

cypress-io · Feb 2, 2024 · f707c63 · f707c63 · cypress-bot · Feb 2, 2024
2 parents 7c87a94 + baafe32
commit f707c63
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/guides/release-process.md b/guides/release-process.md
@@ -191,7 +191,6 @@ _Note: It is advisable to notify the team that the `develop` branch is locked do
     - [cypress-example-todomvc](/~https://github.com/cypress-io/cypress-example-todomvc/issues/99)
     - [cypress-realworld-app](/~https://github.com/cypress-io/cypress-realworld-app/issues/41)
     - [cypress-example-recipes](/~https://github.com/cypress-io/cypress-example-recipes/issues/225)
-    - [cypress-example-docker-compose](/~https://github.com/cypress-io/cypress-example-docker-compose/issues/71)
 
 Take a break, you deserve it! 👉😎👉
 

diff --git a/packages/app/cypress/e2e/specs_list_e2e.cy.ts b/packages/app/cypress/e2e/specs_list_e2e.cy.ts
@@ -317,16 +317,23 @@ describe('App: Spec List (E2E)', () => {
         const targetSpecFile = 'accounts_list.spec.js'
 
         clearSearchAndType(targetSpecFile)
+
+        // wait for filter
+        cy.findAllByTestId('spec-item').should('have.length', 1)
+
         cy.contains('a', targetSpecFile).click()
 
         // make sure we are on the spec view before clicking back to the specs list
         cy.findByTestId('runnable-header').contains(targetSpecFile)
 
         cy.contains('input', targetSpecFile).should('not.exist')
 
-        cy.get('button[aria-controls="reporter-inline-specs-list"]').click({ force: true })
+        cy.contains('button', 'Specs').click({ force: true })
+
+        // wait until specs list is visible
+        cy.findByTestId('specs-list-container').should('be.visible')
 
-        cy.get('@searchField').should('be.visible').and('have.value', targetSpecFile)
+        cy.get('@searchField').should('have.value', targetSpecFile)
 
         cy.findByTestId('sidebar-link-specs-page').click()
 

diff --git a/packages/https-proxy/test/integration/proxy_spec.js b/packages/https-proxy/test/integration/proxy_spec.js
@@ -320,29 +320,32 @@ describe('Proxy', () => {
       })
     })
 
-    it('closes outgoing connections when client disconnects', function () {
+    it('closes outgoing connections when client disconnects', async function () {
       this.sandbox.spy(net, 'connect')
 
-      return request({
+      await request({
         strictSSL: false,
         url: 'https://localhost:8444/replace',
         proxy: 'http://localhost:3333',
         resolveWithFullResponse: true,
         forever: false,
       })
-      .then(() => {
-        // ensure the outgoing socket created for this connection was destroyed
-        expect(net.connect).calledOnce
-        const socket = net.connect.getCalls()[0].returnValue
 
+      // ensure the outgoing socket created for this connection was destroyed
+      expect(net.connect).calledOnce
+      const socket = net.connect.getCalls()[0].returnValue
+
+      // sometimes the close event happens before we can attach the listener,
+      // causing this test to flake
+      if (!socket.destroyed || !socket.readyState === 'closed') {
         return new Promise((resolve) => {
-          return socket.on('close', () => {
+          socket.on('close', () => {
             expect(socket.destroyed).to.be.true
 
             resolve()
           })
         })
-      })
+      }
     })
 
     // /~https://github.com/cypress-io/cypress/issues/4257