breaking: .should() and .and() are now queries.

cli/CHANGELOG.md

@@ -5,11 +5,12 @@ _Released 01/31/2023 (PENDING)_
 
 **Breaking Changes:**
 
+- The [`.should()` and `.and()`](/api/commands/should) assertions are now queries. This means that they are fully retryable, and it is safe to chain further commands that interact with the DOM after them. Assertions are also now re-run as part of aliases. Addressed in [#25296](https://github.com/cypress-io/cypress/pull/25296).
 - The [`cy.readFile()`](/api/commands/readfile) command is now retry-able as a [query command](https://on.cypress.io/retry-ability). This should not affect any tests using it; the functionality is unchanged. However, it can no longer be overwritten using [`Cypress.Commands.overwrite()`](/api/cypress-api/custom-commands#Overwrite-Existing-Commands). Addressed in [#25595](https://github.com/cypress-io/cypress/pull/25595).
 
 ## 12.5.1
 
-_Released 02/10/2023 (PENDING)_
+_Released 02/10/2023_
 
 **Dependency Updates:**
 
@@ -46,6 +47,7 @@ _Released 01/27/2023_
 **Dependency Updates:**
 
 - Upgraded [`ua-parser-js`](https://github.com/faisalman/ua-parser-js) from `0.7.24` to `0.7.33` to address this [security vulnerability](https://github.com/faisalman/ua-parser-js/security/advisories/GHSA-fhg7-m89q-25r3) where crafting a very-very-long user-agent string with specific pattern, an attacker can turn the script to get stuck processing for a very long time which results in a denial of service (DoS) condition. Addressed in [#25561](https://github.com/cypress-io/cypress/pull/25561).
+>>>>>>> e0a97ee948549138b35774a011ca7ef5da849a13
 
 ## 12.4.0
 

packages/app/src/settings/project/RecordKey.cy.tsx

@@ -27,7 +27,8 @@ describe('<RecordKey />', () => {
     cy.get('code').as('Record key input')
     .should('be.visible')
     .contains('code', key).should('not.exist')
-    .get('[aria-label="Record Key Visibility Toggle"]').as('Password Toggle')
+
+    cy.get('[aria-label="Record Key Visibility Toggle"]').as('Password Toggle')
     .click()
 
     cy.contains('code', key).should('be.visible')

packages/app/src/specs/generators/ExpandableFileChooser.cy.tsx

@@ -205,14 +205,14 @@ describe('<ExpandableFileChooser />', () => {
     .type(newExtension, { delay: 0 })
 
     // Validate it's in there
-    .get(extensionInputSelector)
+    cy.get(extensionInputSelector)
     .should('have.value', newExtension)
 
     // debounce should cause this to hit
-    .get('@onUpdateExtensionSpy').should('not.have.been.calledWith', newExtension)
+    cy.get('@onUpdateExtensionSpy').should('not.have.been.calledWith', newExtension)
 
     // once the debounce is resolved, this will hit
-    .get('@onUpdateExtensionSpy').should('have.been.calledWith', newExtension)
+    cy.get('@onUpdateExtensionSpy').should('have.been.calledWith', newExtension)
   })
 
   it('renders expanded content slot when row is clicked', () => {

packages/app/src/specs/generators/FileChooser.cy.tsx

@@ -237,10 +237,10 @@ describe('<FileChooser />', () => {
     .should('have.value', newExtension)
 
     // debounce should cause this to hit
-    .get('@onUpdateExtensionSpy').should('not.have.been.calledWith', newExtension)
+    cy.get('@onUpdateExtensionSpy').should('not.have.been.calledWith', newExtension)
 
     // once the debounce is resolved, this will hit
-    .get('@onUpdateExtensionSpy').should('have.been.calledWith', newExtension)
+    cy.get('@onUpdateExtensionSpy').should('have.been.calledWith', newExtension)
   })
 
   it('fires a selectFile event when a file is clicked on', () => {

packages/driver/cypress/e2e/commands/aliasing.cy.js

@@ -511,6 +511,25 @@ describe('src/cy/commands/aliasing', () => {
       // so we just have the primitive value "3" as our subject.
       cy.get('@itemCount').should('eq', 3)
     })
+
+    it('retries assertions', () => {
+      const obj = { value: 'a' }
+
+      cy.on('command:retry', () => {
+        // On the first retry, set it to 0. After that, increment it.
+        obj.value = typeof obj.value === 'number' ? obj.value + 1 : 0
+      })
+
+      cy.wrap(obj).its('value').should('gt', 0).as('val')
+
+      cy.get('@val').should('eq', 2)
+    })
+
+    it('includes assertions in the subject chain', () => {
+      cy.get('#button').should('have.css', 'font-family').as('font')
+
+      cy.get('@font').should('be.a', 'string')
+    })
   })
 
   context('#getAlias', () => {