[BUGFIX] ensure that the belongsTo proxy for async relationships upda…

…tes content when new content is explicitly null
emberjs · Apr 30, 2018 · ddf5e95 · ddf5e95
1 parent 741fe77
commit ddf5e95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/addon/-private/system/relationships/state/belongs-to.js b/addon/-private/system/relationships/state/belongs-to.js
@@ -188,7 +188,7 @@ export default class BelongsToRelationship extends Relationship {
 
   _updateLoadingPromise(promise, content) {
     if (this._loadingPromise) {
-      if (content) {
+      if (content !== undefined) {
         this._loadingPromise.set('content', content)
       }
       this._loadingPromise.set('promise', promise)

diff --git a/tests/integration/relationships/belongs-to-test.js b/tests/integration/relationships/belongs-to-test.js
@@ -95,7 +95,7 @@ module("integration/relationship/belongs_to Belongs-To Relationships", {
 test("returning a null relationship from payload sets the relationship to null on both sides", function(assert) {
   env.registry.register('model:app', DS.Model.extend({
     name: attr('string'),
-    team: belongsTo('team', { async: true }),
+    team: belongsTo('team', { async: true })
   }));
   env.registry.register('model:team', DS.Model.extend({
     apps: hasMany('app', {async: true})