From 47884032ad255e8e15144dcd3545c3267795dee0 Mon Sep 17 00:00:00 2001
From: Chris Bandy <bandy.chris@gmail.com>
Date: Sat, 1 Mar 2014 17:01:05 -0600
Subject: [PATCH] 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.
---
 spec/core/ObjectContainingSpec.js | 6 ++++++
 src/core/ObjectContaining.js      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/spec/core/ObjectContainingSpec.js b/spec/core/ObjectContainingSpec.js
index 24341532..27bd71ef 100644
--- 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
index 215fcfcb..a9d05185 100644
--- 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.');
       }
     }