Merge 217a032 into f701abe

sinonjs · Mar 27, 2017 · bb44c07 · bb44c07
2 parents f701abe + 217a032
commit bb44c07
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/sinon/mock-expectation.js b/lib/sinon/mock-expectation.js
@@ -182,7 +182,7 @@ var mockExpectation = {
                 mockExpectation.fail(this.method + " received wrong arguments " + format(args) +
                     ", expected " + format(expectedArguments));
             }
-        });
+        }, this);
     },
 
     allowsCall: function allowsCall(thisValue, args) {

diff --git a/test/mock-test.js b/test/mock-test.js
@@ -475,6 +475,17 @@ describe("sinonMock", function () {
         });
 
         describe(".withArgs", function () {
+            var expectedException = function (name) {
+                return {
+                    test: function (actual) {
+                        return actual.name === name;
+                    },
+                    toString: function () {
+                        return name;
+                    }
+                };
+            };
+
             it("returns expectation for chaining", function () {
                 assert.same(this.expectation.withArgs(1), this.expectation);
             });
@@ -510,7 +521,7 @@ describe("sinonMock", function () {
 
                 assert.exception(function () {
                     expectation(2, 2, 3);
-                }, "ExpectationError");
+                }, expectedException("ExpectationError"));
             });
 
             it("allows excessive args", function () {