fix: .contains() should only return one element at all times (#25250)

* fix: .contains() should only return one element at all times

* Improve test name

* Add additional test

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

@@ -1020,6 +1020,15 @@ describe('src/cy/commands/querying', () => {
       })
     })
 
+    // https://github.com/cypress-io/cypress/issues/25225
+    it('returns only one element when given multiple subjects directly match selector', () => {
+      // A case with only a text selector
+      cy.get('button').contains('submit').should('have.length', 1)
+
+      // A case with a filter + text selector
+      cy.get('div').contains('div', 'foo').should('have.length', 1)
+    })
+
     // https://github.com/cypress-io/cypress/issues/25019
     it('can locate elements contained inside <form> containers', () => {
       cy.get('#focus').contains('button', 'focusable')

packages/driver/src/cy/commands/querying/querying.ts

@@ -327,14 +327,14 @@ export default (Commands, Cypress, cy, state) => {
         $el = $el.add(getFn())
       })
 
-      if ($el.length) {
-        $el = $dom.getFirstDeepestElement($el)
-      } else {
+      if (!$el.length) {
         // .get() looks for elements *inside* the current subject, while contains() wants to also match the current
         // subject itself if no child matches.
         $el = (subject as JQuery).filter(selector)
       }
 
+      $el = $dom.getFirstDeepestElement($el)
+
       log && cy.state('current') === this && log.set({
         $el,
         consoleProps: () => {