Merge branch 'charleshansen-to_contain_array_like_objects'

lib/jasmine-core/jasmine.js

@@ -2195,7 +2195,12 @@ getJasmineRequireObj().matchersUtil = function(j$) {
         }
         return false;
       }
-      return !!haystack && haystack.indexOf(needle) >= 0;
+      if (!haystack) {
+        return false;
+      } else {
+        var indexOf = haystack.indexOf || Array.prototype.indexOf;
+        return indexOf.call(haystack, needle) >= 0;
+      }
     },
 
     buildFailureMessage: function() {

spec/core/matchers/matchersUtilSpec.js

@@ -207,6 +207,15 @@ describe("matchersUtil", function() {
     it("fails when actual is null", function() {
       expect(j$.matchersUtil.contains(null, 'A')).toBe(false);
     });
+
+    it("passes with array-like objects", function() {
+      var capturedArgs = null;
+      function testFunction(){
+        capturedArgs = arguments;
+      }
+      testFunction('foo', 'bar');
+      expect(j$.matchersUtil.contains(capturedArgs, 'bar')).toBe(true);
+    });
   });
 
   describe("buildMessage", function() {

src/core/matchers/matchersUtil.js

@@ -19,7 +19,12 @@ getJasmineRequireObj().matchersUtil = function(j$) {
         }
         return false;
       }
-      return !!haystack && haystack.indexOf(needle) >= 0;
+      if (!haystack) {
+        return false;
+      } else {
+        var indexOf = haystack.indexOf || Array.prototype.indexOf;
+        return indexOf.call(haystack, needle) >= 0;
+      }
     },
 
     buildFailureMessage: function() {