Merge branch 'arrayContaining' of https://github.com/slackersoft/jasmine into slackersoft-arrayContaining

Merge #440 [Finish #59947350]

spec/core/asymmetric_equality/ArrayContainingSpec.js

@@ -0,0 +1,39 @@
+describe("ArrayContaining", function() {
+  it("matches any actual to an empty array", function() {
+    var containing = new j$.ArrayContaining([]);
+
+    expect(containing.asymmetricMatch("foo")).toBe(true);
+  });
+
+  it("does not work when not passed an array", function() {
+    var containing = new j$.ArrayContaining("foo");
+
+    expect(function() {
+      containing.asymmetricMatch([]);
+    }).toThrowError(/not 'foo'/);
+  });
+
+  it("matches when the item is in the actual", function() {
+    var containing = new j$.ArrayContaining(["foo"]);
+
+    expect(containing.asymmetricMatch(["foo"])).toBe(true);
+  });
+
+  it("matches when additional items are in the actual", function() {
+    var containing = new j$.ArrayContaining(["foo"]);
+
+    expect(containing.asymmetricMatch(["foo", "bar"])).toBe(true);
+  });
+
+  it("does not match when the item is not in the actual", function() {
+    var containing = new j$.ArrayContaining(["foo"]);
+
+    expect(containing.asymmetricMatch(["bar"])).toBe(false);
+  });
+
+  it("jasmineToStrings itself", function() {
+    var containing = new j$.ArrayContaining([]);
+
+    expect(containing.jasmineToString()).toMatch("<jasmine.arrayContaining");
+  });
+});

spec/core/matchers/matchersUtilSpec.js

@@ -212,6 +212,12 @@ describe("matchersUtil", function() {
       expect(j$.matchersUtil.equals(tester, true)).toBe(false);
     });
 
+    it("passes when ArrayContaining is used", function() {
+      var arr = ["foo", "bar"];
+
+      expect(j$.matchersUtil.equals(arr, new j$.ArrayContaining(["bar"]))).toBe(true);
+    });
+
     it("passes when a custom equality matcher returns true", function() {
       var tester = function(a, b) { return true; };
 

src/core/asymmetric_equality/ArrayContaining.js

@@ -0,0 +1,25 @@
+getJasmineRequireObj().ArrayContaining = function(j$) {
+  function ArrayContaining(sample) {
+    this.sample = sample;
+  }
+
+  ArrayContaining.prototype.asymmetricMatch = function(other) {
+    var className = Object.prototype.toString.call(this.sample);
+    if (className !== "[object Array]") { throw new Error("You must provide an array to arrayContaining, not '" + this.sample + "'."); }
+
+    for (var i = 0; i < this.sample.length; i++) {
+      var item = this.sample[i];
+      if (!j$.matchersUtil.contains(other, item)) {
+        return false;
+      }
+    }
+
+    return true;
+  };
+
+  ArrayContaining.prototype.jasmineToString = function () {
+    return "<jasmine.arrayContaining(" + jasmine.pp(this.sample) +")>";
+  };
+
+  return ArrayContaining;
+};

src/core/base.js

@@ -57,6 +57,10 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
     return new j$.StringMatching(expected);
   };
 
+  j$.arrayContaining = function(sample) {
+    return new j$.ArrayContaining(sample);
+  };
+
   j$.createSpy = function(name, originalFn) {
 
     var spyStrategy = new j$.SpyStrategy({

src/core/requireCore.js

@@ -30,6 +30,7 @@ getJasmineRequireObj = (function (jasmineGlobal) {
     j$.JsApiReporter = jRequire.JsApiReporter();
     j$.matchersUtil = jRequire.matchersUtil(j$);
     j$.ObjectContaining = jRequire.ObjectContaining(j$);
+    j$.ArrayContaining = jRequire.ArrayContaining(j$);
     j$.pp = jRequire.pp(j$);
     j$.QueueRunner = jRequire.QueueRunner(j$);
     j$.ReportDispatcher = jRequire.ReportDispatcher();