From 98e86817bfc0c83fe0804ed59486dd18560afe96 Mon Sep 17 00:00:00 2001
From: Christian Williams <antixian666@gmail.com>
Date: Thu, 12 Nov 2009 15:03:55 -0500
Subject: [PATCH] Fix wasCalledWith matcher.

---
 spec/suites/MatchersSpec.js | 42 +++++++++++++++++++------------------
 src/Matchers.js             |  2 +-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/spec/suites/MatchersSpec.js b/spec/suites/MatchersSpec.js
index 06a2d5b..9bc40fe 100644
--- a/spec/suites/MatchersSpec.js
+++ b/spec/suites/MatchersSpec.js
@@ -535,28 +535,30 @@ describe("jasmine.Matchers", function() {
         expect(match(TestClass.someFunction).wasNotCalled()).toEqual(false);
       });
 
-      it('should return true if it was called with the expected args', function() {
-        TestClass.someFunction('a', 'b', 'c');
-        expect(match(TestClass.someFunction).wasCalledWith('a', 'b', 'c')).toEqual(true);
-      });
+      describe("wasCalledWith", function() {
+        it('wasCalledWith should return true if it was called with the expected args', function() {
+          TestClass.someFunction('a', 'b', 'c');
+          expect(match(TestClass.someFunction).wasCalledWith('a', 'b', 'c')).toEqual(true);
+        });
 
-      it('should return false if it was not called with the expected args', function() {
-        TestClass.someFunction('a', 'b', 'c');
-        var expected = match(TestClass.someFunction);
-        expect(expected.wasCalledWith('c', 'b', 'a')).toEqual(false);
-        var result = mockSpec.addMatcherResult.mostRecentCall.args[0];
-        expect(result.passed()).toEqual(false);
-        expect(result.expected).toEqual(['c', 'b', 'a']);
-        expect(result.actual.mostRecentCall.args).toEqual(['a', 'b', 'c']);
-      });
+        it('should return false if it was not called with the expected args', function() {
+          TestClass.someFunction('a', 'b', 'c');
+          var expected = match(TestClass.someFunction);
+          expect(expected.wasCalledWith('c', 'b', 'a')).toEqual(false);
+          var result = mockSpec.addMatcherResult.mostRecentCall.args[0];
+          expect(result.passed()).toEqual(false);
+          expect(result.expected).toEqual(['c', 'b', 'a']);
+          expect(result.actual.mostRecentCall.args).toEqual(['a', 'b', 'c']);
+        });
 
-      it('should allow matches across multiple calls', function() {
-        var expected = match(TestClass.someFunction);
-        TestClass.someFunction('a', 'b', 'c');
-        TestClass.someFunction('d', 'e', 'f');
-        expect(expected.wasCalledWith('a', 'b', 'c')).toEqual(true);
-        expect(expected.wasCalledWith('d', 'e', 'f')).toEqual(true);
-        expect(expected.wasCalledWith('x', 'y', 'z')).toEqual(false);
+        it('should allow matches across multiple calls', function() {
+          var expected = match(TestClass.someFunction);
+          TestClass.someFunction('a', 'b', 'c');
+          TestClass.someFunction('d', 'e', 'f');
+          expect(expected.wasCalledWith('a', 'b', 'c')).toEqual(true);
+          expect(expected.wasCalledWith('d', 'e', 'f')).toEqual(true);
+          expect(expected.wasCalledWith('x', 'y', 'z')).toEqual(false);
+        });
       });
     });
   });
diff --git a/src/Matchers.js b/src/Matchers.js
index b4486b7..b31f4f6 100644
--- a/src/Matchers.js
+++ b/src/Matchers.js
@@ -224,7 +224,7 @@ jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.matcherFn_('wasCalle
       throw new Error('Expected a spy, but got ' + jasmine.Matchers.pp(this.actual) + '.');
     }
 
-    return this.env.contains_(this.actual.argsForCall, arguments);
+    return this.env.contains_(this.actual.argsForCall, jasmine.util.argsToArray(arguments));
   },
   message: function() {
     return "Expected spy to have been called with " + jasmine.pp(arguments) + " but was called with " + this.actual.argsForCall;