Merge pull request #4271 from pangratz/fix-references-value

[BUGFIX beta] Ensure `null` is returned for Reference#value()
emberjs · Mar 28, 2016 · 4eb34ee · 4eb34ee
2 parents 4edd88a + 88a80da
commit 4eb34ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/addon/-private/system/references/belongs-to.js b/addon/-private/system/references/belongs-to.js
@@ -58,7 +58,12 @@ BelongsToReference.prototype.push = function(objectOrPromise) {
 
 BelongsToReference.prototype.value = function() {
   var inverseRecord = this.belongsToRelationship.inverseRecord;
-  return inverseRecord && inverseRecord.record;
+
+  if (inverseRecord && inverseRecord.record) {
+    return inverseRecord.record;
+  }
+
+  return null;
 };
 
 BelongsToReference.prototype.load = function() {

diff --git a/tests/integration/references/belongs-to-test.js b/tests/integration/references/belongs-to-test.js
@@ -332,7 +332,7 @@ if (isEnabled("ds-references")) {
     });
 
     var familyReference = person.belongsTo('family');
-    assert.equal(familyReference.value(), null);
+    assert.strictEqual(familyReference.value(), null);
   });
 
   test("value() returns the referenced record when loaded", function(assert) {

diff --git a/tests/integration/references/has-many-test.js b/tests/integration/references/has-many-test.js
@@ -338,7 +338,7 @@ if (isEnabled("ds-references")) {
     });
 
     var personsReference = family.hasMany('persons');
-    assert.equal(personsReference.value(), null);
+    assert.strictEqual(personsReference.value(), null);
   });
 
   test("value() returns the referenced records when all records are loaded", function(assert) {