Merge pull request #3037 from pangratz/fix_isReloading_flag

Reset Model#isReloading to false when request fails
emberjs · May 3, 2015 · 2f2f8a9 · 2f2f8a9
2 parents 7f86945 + d05de8c
commit 2f2f8a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/ember-data/lib/system/model/model.js b/packages/ember-data/lib/system/model/model.js
@@ -1099,13 +1099,13 @@ var Model = Ember.Object.extend(Ember.Evented, {
     var promise = new Promise(function(resolve) {
       record.send('reloadRecord', resolve);
     }, promiseLabel).then(function() {
-      record.set('isReloading', false);
       record.set('isError', false);
       return record;
     }, function(reason) {
       record.set('isError', true);
       throw reason;
     }, "DS: Model#reload complete, update flags")['finally'](function () {
+      record.set('isReloading', false);
       record.updateRecordArrays();
     });
 

diff --git a/packages/ember-data/tests/integration/records/reload-test.js b/packages/ember-data/tests/integration/records/reload-test.js
@@ -59,6 +59,7 @@ test("When a record is reloaded and fails, it can try again", function() {
 
   var count = 0;
   env.adapter.find = function(store, type, id, snapshot) {
+    equal(tom.get('isReloading'), true, "Tom is reloading");
     if (count++ === 0) {
       return Ember.RSVP.reject();
     } else {
@@ -69,10 +70,12 @@ test("When a record is reloaded and fails, it can try again", function() {
   run(function() {
     tom.reload().then(null, function() {
       equal(tom.get('isError'), true, "Tom is now errored");
+      equal(tom.get('isReloading'), false, "Tom is no longer reloading");
       return tom.reload();
     }).then(function(person) {
       equal(person, tom, "The resolved value is the record");
       equal(tom.get('isError'), false, "Tom is no longer errored");
+      equal(tom.get('isReloading'), false, "Tom is no longer reloading");
       equal(tom.get('name'), "Thomas Dale", "the updates apply");
     });
   });