Merge 8809607 into 6377e5b

sinonjs · Sep 18, 2018 · 8981c5b · 8981c5b
2 parents 6377e5b + 8809607
commit 8981c5b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,6 +26,7 @@ jobs:
               wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
               echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list.d/google.list
               apt-get -qq update
+              apt-get -qq install -y --no-install-recommends google-chrome-stable
               apt-get -qq install -y --no-install-recommends google-chrome-unstable
             fi
       - run:
@@ -36,7 +37,7 @@ jobs:
               npm run lint
 
               npm run test-headless -- --chrome $(which google-chrome-unstable) --allow-chrome-as-root
-              npm run test-webworker -- --chrome $(which google-chrome-unstable) --allow-chrome-as-root
+              npm run test-webworker -- --chrome $(which google-chrome-stable) --allow-chrome-as-root
               npm run test-esm-bundle
 
               if [ -z "$CIRCLE_PULL_REQUESTS" ]; then

diff --git a/lib/sinon/fake.js b/lib/sinon/fake.js
@@ -45,7 +45,7 @@ function wrapFunc(f) {
         p.callback = callback;
         /* eslint-enable no-use-before-define */
 
-        return f && f.apply(f, arguments);
+        return f && f.apply(this, arguments);
     };
     var p = cleanProxy(spy(fakeInstance));
 

diff --git a/test/fake-test.js b/test/fake-test.js
@@ -51,6 +51,17 @@ describe("fake", function () {
 
     describe("when passed a Function", function () {
         verifyProxy(fake, function () {});
+
+        it("should keep the `this` context of the wrapped function", function () {
+            function method() { return this.foo; }
+            var o = { foo: 42 };
+            var fakeMethod = fake(method);
+
+            var result = fakeMethod.call(o);
+
+            assert.equals(fakeMethod.callCount, 1);
+            assert.equals(result, 42);
+        });
     });
 
     describe("when passed no value", function () {