Use last matching withArgs declaration when using matchers

sinonjs · Nov 10, 2016 · 5c79afd · 5c79afd
1 parent e6d2bd2
commit 5c79afd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/lib/sinon/spy.js b/lib/sinon/spy.js
@@ -53,9 +53,11 @@ function matchingFake(fakes, args, strict) {
         return undefined;
     }
 
-    for (var i = 0, l = fakes.length; i < l; i++) {
-        if (fakes[i].matches(args, strict)) {
-            return fakes[i];
+    var fakesIndex = fakes.length;
+
+    while (fakesIndex--) {
+        if (fakes[fakesIndex].matches(args, strict)) {
+            return fakes[fakesIndex];
         }
     }
 

diff --git a/test/stub-test.js b/test/stub-test.js
@@ -1345,6 +1345,24 @@ describe("stub", function () {
             assert.equals(stub(), 23);
             assert.equals(stub({ foo: "bar", bar: "foo" }), 99);
         });
+
+        it("ensure stub uses last matching arguments", function () {
+            var stub = createStub().returns(23);
+            stub.withArgs(2).returns(9);
+            stub.withArgs(2).returns(99);
+
+            assert.equals(stub(), 23);
+            assert.equals(stub(2), 99);
+        });
+
+        it("ensure stub uses last matching sinonMatch arguments", function () {
+            var stub = createStub().returns(23);
+            stub.withArgs(2).returns(9);
+            stub.withArgs(sinonMatch(2)).returns(99);
+
+            assert.equals(stub(), 23);
+            assert.equals(stub(2), 99);
+        });
     });
 
     describe(".callsArgAsync", function () {