Fix ObjectContaining to match recursively

matchersUtil.equals() does not expect a matcher as its first argument, so send the "actual" value first and the "expected" value second.
shengtao · Mar 2, 2014 · 4788403 · 4788403
1 parent d705361
commit 4788403
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/spec/core/ObjectContainingSpec.js b/spec/core/ObjectContainingSpec.js
@@ -61,4 +61,10 @@ describe("ObjectContaining", function() {
 
     expect(containing.jasmineToString()).toMatch("<jasmine.objectContaining");
   });
+
+  it("matches recursively", function() {
+    var containing = new j$.ObjectContaining({one: new j$.ObjectContaining({two: {}})});
+
+    expect(containing.jasmineMatches({one: {two: {}}})).toBe(true);
+  });
 });
diff --git a/src/core/ObjectContaining.js b/src/core/ObjectContaining.js
@@ -18,7 +18,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
       if (!hasKey(other, property) && hasKey(this.sample, property)) {
         mismatchKeys.push('expected has key \'' + property + '\', but missing from actual.');
       }
-      else if (!j$.matchersUtil.equals(this.sample[property], other[property])) {
+      else if (!j$.matchersUtil.equals(other[property], this.sample[property])) {
         mismatchValues.push('\'' + property + '\' was \'' + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + '\' in actual, but was \'' + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + '\' in expected.');
       }
     }