Merge branch 'develop' into mschile/issue-30922

cypress-io · Jan 27, 2025 · 6146fc0 · 6146fc0 · cypress-bot · Jan 27, 2025
2 parents 5cef570 + 1548047
commit 6146fc0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -9,6 +9,7 @@ _Released 1/28/2025 (PENDING)_
 - Fixed a regression introduced in [`14.0.0`](https://docs.cypress.io/guides/references/changelog#14-0-0) where an element would not return the correct visibility if its offset parent was within the clipping element. Fixes [#30922](https://github.com/cypress-io/cypress/issues/30922).
 - Fixed a regression introduced in [`14.0.0`](https://docs.cypress.io/guides/references/changelog#14-0-0) where the incorrect visiblity would be returned when either `overflow-x` or `overflow-y` was visible but the other one was clipping. Fixed in [#30934](https://github.com/cypress-io/cypress/pull/30934).
 - Fixed an issue where an `option` element would not return the correct visibility if its parent element has a clipping overflow. Fixed in [#30934](https://github.com/cypress-io/cypress/pull/30934).
+- Fixed an issue where non-HTMLElement(s) may fail during assertions. Fixes [#30944](https://github.com/cypress-io/cypress/issues/30944)
 
 **Misc:**
 

diff --git a/packages/driver/cypress/e2e/commands/assertions.cy.js b/packages/driver/cypress/e2e/commands/assertions.cy.js
@@ -939,6 +939,17 @@ describe('src/cy/commands/assertions', () => {
       expect(2n).to.equal(2n)
     })
 
+    it('handles non-HTMLElement(s) (e.g. Element)', () => {
+      const xml = '<?xml version="1.0" encoding="UTF-8"?><foo><bar>Bar</bar></foo>'
+      const parser = new DOMParser()
+      const doc = parser.parseFromString(xml, 'application/xml')
+      const foo = doc.getElementsByTagName('foo')[0]
+
+      expect(foo).not.to.be.undefined
+      expect(foo).to.be.instanceOf(Element)
+      expect(foo).not.to.be.instanceOf(HTMLElement)
+    })
+
     it('#consoleProps for regular objects', (done) => {
       cy.on('log:added', (attrs, log) => {
         if (attrs.name === 'assert') {

diff --git a/packages/driver/src/dom/visibility.ts b/packages/driver/src/dom/visibility.ts
@@ -147,13 +147,11 @@ const elHasNoEffectiveWidthOrHeight = ($el: JQuery) => {
   // display:none elements, and generally any elements that are not directly rendered,
   // an empty list is returned.
   const el = $el[0]
-  let transform
 
-  if ($el[0].style.transform) {
-    const style = getComputedStyle(el)
+  const style = getComputedStyle(el)
+  let transform = style.getPropertyValue('transform')
 
-    transform = style.getPropertyValue('transform')
-  } else {
+  if (!transform.length) {
     transform = 'none'
   }