[BUGFIX] Reference.reload should not cause sync-relationship assertion (

emberjs#5582) * refactor reload tests and add tests for reference reloading * dont assert loaded state if reloading * only disable data integrity checks for the forced reload itself
runspired · Aug 27, 2018 · bdea2d9 · bdea2d9
1 parent b9e3638
commit bdea2d9
Show file tree

Hide file tree

Showing 5 changed files with 659 additions and 191 deletions.
diff --git a/addon/-private/system/relationships/state/belongs-to.js b/addon/-private/system/relationships/state/belongs-to.js
@@ -211,7 +211,13 @@ export default class BelongsToRelationship extends Relationship {
       });
   }
 
-  getData() {
+  /*
+    While the `shouldForceReload` flag will also be true when `isForcedReload` is true,
+    `isForcedReload` is only `true` for an initial `getData` call during a forced reload.
+    Other calls must conform to the typical expectations, for instance, sync relationships
+    expect that their data is already loaded.
+   */
+  getData(isForcedReload = false) {
     //TODO(Igor) flushCanonical here once our syncing is not stupid
     let record = this.inverseInternalModel ? this.inverseInternalModel.getRecord() : null;
 
@@ -250,7 +256,7 @@ export default class BelongsToRelationship extends Relationship {
           "' with id " +
           this.internalModel.id +
           ' but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (`DS.belongsTo({ async: true })`)',
-        record === null || !record.get('isEmpty')
+        record === null || !record.get('isEmpty') || isForcedReload
       );
       return record;
     }

diff --git a/addon/-private/system/relationships/state/has-many.js b/addon/-private/system/relationships/state/has-many.js
@@ -343,7 +343,7 @@ export default class ManyRelationship extends Relationship {
       });
   }
 
-  getData() {
+  getData(isForcedReload = false) {
     //TODO(Igor) sync server here, once our syncing is not stupid
     let manyArray = this.manyArray;
 
@@ -378,7 +378,7 @@ export default class ManyRelationship extends Relationship {
         }' with id ${
           this.internalModel.id
         } but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (\`DS.hasMany({ async: true })\`)`,
-        this.allInverseRecordsAreLoaded
+        this.allInverseRecordsAreLoaded || isForcedReload
       );
 
       return manyArray;

diff --git a/addon/-private/system/relationships/state/relationship.js b/addon/-private/system/relationships/state/relationship.js
@@ -543,7 +543,7 @@ export default class Relationship {
 
     this.setHasFailedLoadAttempt(false);
     this.setShouldForceReload(true);
-    this.getData();
+    this.getData(true);
 
     return this._promiseProxy;
   }

diff --git a/tests/acceptance/relationships/has-many-test.js b/tests/acceptance/relationships/has-many-test.js
@@ -30,7 +30,7 @@ class TestAdapter extends JSONAPIAdapter {
     this._payloads = arr;
   }
 
-  shouldBackgroundReload() {
+  shouldBackgroundReloadRecord() {
     return false;
   }