call setTimeout with the right global scope to prevent 'this' f… (#5709)

cypress-io · Nov 15, 2019 · ff6bdcd · ff6bdcd · cypress-bot · Nov 15, 2019
1 parent 5d2825c
commit ff6bdcd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/packages/driver/src/cy/timers.js b/packages/driver/src/cy/timers.js
@@ -19,7 +19,7 @@ const create = () => {
 
   const invoke = (contentWindow, fnOrCode, params = []) => {
     if (_.isFunction(fnOrCode)) {
-      return fnOrCode(...params)
+      return fnOrCode.apply(contentWindow, params)
     }
 
     return contentWindow.eval(fnOrCode)

diff --git a/packages/driver/test/cypress/fixtures/issue-5707.html b/packages/driver/test/cypress/fixtures/issue-5707.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+<body>
+  <script>
+    'use strict';
+    window.setTimeout(function () {
+      this.foo = 'bar'
+    }, 50)
+  </script>
+</body>
+</html>
diff --git a/packages/driver/test/cypress/integration/issues/5707_spec.js b/packages/driver/test/cypress/integration/issues/5707_spec.js
@@ -0,0 +1,7 @@
+// https://github.com/cypress-io/cypress/issues/5707
+describe('issue 5707', () => {
+  it('calls setTimeout with the correct context', () => {
+    cy.visit('/fixtures/issue-5707.html')
+    cy.window().its('foo').should('eq', 'bar')
+  })
+})