Merge branch 'develop' into TR-667-remove-preprocessor-error-stack-tr…

…uncation
cypress-io · Feb 24, 2021 · 800c809 · 800c809
2 parents 6638fb4 + c3af3dc
commit 800c809
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 9 deletions.
diff --git a/npm/react/package.json b/npm/react/package.json
@@ -103,6 +103,7 @@
   "peerDependencies": {
     "@babel/core": "^=7.x",
     "@babel/preset-env": "^=7.x",
+    "@cypress/webpack-dev-server": "*",
     "@types/react": "^16.9.16 || ^17.0.0",
     "babel-loader": "^=8.x",
     "cypress": "*",
@@ -141,6 +142,9 @@
     "@babel/preset-env": {
       "optional": true
     },
+    "@cypress/webpack-dev-server": {
+      "optional": true
+    },
     "@types/react": {
       "optional": true
     },

diff --git a/npm/vue/package.json b/npm/vue/package.json
@@ -12,7 +12,6 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@cypress/webpack-dev-server": "0.0.0-development",
     "@vue/test-utils": "1.0.3",
     "unfetch": "4.1.0"
   },
@@ -21,6 +20,7 @@
     "@babel/plugin-transform-modules-commonjs": "7.10.4",
     "@babel/preset-env": "7.9.5",
     "@cypress/code-coverage": "3.8.1",
+    "@cypress/webpack-dev-server": "0.0.0-development",
     "@intlify/vue-i18n-loader": "1.0.0",
     "@vue/cli-plugin-babel": "~4.4.0",
     "@vue/cli-service": "~4.4.0",
@@ -45,6 +45,7 @@
     "webpack": "4.42.0"
   },
   "peerDependencies": {
+    "@cypress/webpack-dev-server": "*",
     "babel-loader": "8",
     "cypress": ">=4.5.0",
     "vue": "2.x"
@@ -68,6 +69,11 @@
     "cypress",
     "vue"
   ],
+  "peerDependenciesMeta": {
+    "@cypress/webpack-dev-server": {
+      "optional": true
+    }
+  },
   "publishConfig": {
     "access": "public",
     "registry": "http://registry.npmjs.org/"

diff --git a/packages/driver/cypress/fixtures/issue-8279.html b/packages/driver/cypress/fixtures/issue-8279.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <form tabindex="0">
+    <div style="height: 2000px"></div>
+    <div id="clickme">click me</div>
+  </form>
+  <script>
+    const button = document.getElementById('clickme')
+
+    let yPos
+    button.addEventListener('mousedown', e => {
+      yPos = e.currentTarget.getBoundingClientRect().y
+    })
+    button.addEventListener('click', (e) => {
+      let yPos2 = e.currentTarget.getBoundingClientRect().y
+
+      if (yPos !== yPos2) {
+        throw new Error('element was scrolled during mousedown')
+      }
+    })
+  </script>
+</body>
+</html>
diff --git a/packages/driver/cypress/integration/dom/jquery_spec.ts b/packages/driver/cypress/integration/dom/jquery_spec.ts
@@ -21,4 +21,16 @@ describe('src/dom/jquery', () => {
       })
     })
   })
+
+  // https://github.com/cypress-io/cypress/issues/14279
+  it('empty jQuery object is shown properly in "DOM required" error message', (done) => {
+    cy.on('fail', (err) => {
+      expect(err.message).to.include('jQuery{0}')
+
+      done()
+    })
+
+    cy.visit('fixtures/dom.html')
+    cy.noop(cy.$$('#should-not-exist')).scrollTo('250px', '250px')
+  })
 })
diff --git a/packages/driver/cypress/integration/issues/8279_spec.js b/packages/driver/cypress/integration/issues/8279_spec.js
@@ -0,0 +1,7 @@
+// https://github.com/cypress-io/cypress/issues/8279
+describe('issue 8279', () => {
+  it('can click button inside large div with tabindex=0 without scrolling', () => {
+    cy.visit('/fixtures/issue-8279.html')
+    cy.get('#clickme').click()
+  })
+})
diff --git a/packages/driver/src/cy/focused.js b/packages/driver/src/cy/focused.js
@@ -72,7 +72,7 @@ const create = (state) => {
     return el.dispatchEvent(focusoutEvt)
   }
 
-  const fireFocus = (el) => {
+  const fireFocus = (el, opts) => {
     // body will never emit focus events (unless it's contenteditable)
     // so we avoid simulating this
     if ($elements.isBody(el) && !$elements.isContentEditable(el)) {
@@ -112,7 +112,7 @@ const create = (state) => {
 
     $elements.callNativeMethod(el, 'addEventListener', 'focus', onFocus)
 
-    $elements.callNativeMethod(el, 'focus')
+    $elements.callNativeMethod(el, 'focus', opts)
 
     cleanup()
 

diff --git a/packages/driver/src/cy/mouse.js b/packages/driver/src/cy/mouse.js
@@ -479,7 +479,7 @@ const create = (state, keyboard, focused, Cypress) => {
           }
         } else {
           // the user clicked inside a focusable element
-          focused.fireFocus($elToFocus.get(0))
+          focused.fireFocus($elToFocus.get(0), { preventScroll: true })
         }
       }
 

diff --git a/packages/driver/src/cypress/utils.js b/packages/driver/src/cypress/utils.js
@@ -2,6 +2,7 @@ const _ = require('lodash')
 const capitalize = require('underscore.string/capitalize')
 const methods = require('methods')
 const moment = require('moment')
+const $ = require('jquery')
 
 const $jquery = require('../dom/jquery')
 const $Location = require('./location')
@@ -182,6 +183,11 @@ module.exports = {
     }
 
     if (_.isObject(value)) {
+      // Cannot use $dom.isJquery here because it causes infinite recursion.
+      if (value instanceof $) {
+        return `jQuery{${value.length}}`
+      }
+
       const len = _.keys(value).length
 
       if (len > 2) {

diff --git a/packages/electron/package.json b/packages/electron/package.json
@@ -24,7 +24,7 @@
     "minimist": "1.2.5"
   },
   "devDependencies": {
-    "electron": "11.2.3",
+    "electron": "11.3.0",
     "execa": "4.1.0",
     "mocha": "3.5.3"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -14174,10 +14174,10 @@ electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromi
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.636.tgz#6980bd90813a9fb744e43f5e848f16cea4930058"
   integrity sha512-Adcvng33sd3gTjNIDNXGD1G4H6qCImIy2euUJAQHtLNplEKU5WEz5KRJxupRNIIT8sD5oFZLTKBWAf12Bsz24A==
 
-electron@11.2.3:
-  version "11.2.3"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb"
-  integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ==
+electron@11.3.0:
+  version "11.3.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-11.3.0.tgz#87e8528fd23ae53b0eeb3a738f1fe0a3ad27c2db"
+  integrity sha512-MhdS0gok3wZBTscLBbYrOhLaQybCSAfkupazbK1dMP5c+84eVMxJE/QGohiWQkzs0tVFIJsAHyN19YKPbelNrQ==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"