Failing test: 'When a record is loaded a second time, isLoaded should stay true

packages/ember-data/lib/system/model/states.js

@@ -525,9 +525,6 @@ var states = {
       // SUBSTATES
 
       materializing: DS.State.create({
-        // FLAGS
-        isLoaded: false,
-
         // EVENTS
         willSetProperty: Ember.K,
         didSetProperty: Ember.K,
@@ -540,6 +537,9 @@ var states = {
 
         // SUBSTATES
         firstTime: DS.State.create({
+          // FLAGS
+          isLoaded: false,
+
           exit: function(manager) {
             var record = get(manager, 'record');
 

packages/ember-data/tests/integration/reload_test.js

@@ -94,3 +94,27 @@ asyncTest("If a record is modified, it cannot be reloaded", function() {
     }, /uncommitted/);
   }
 });
+
+
+asyncTest("When a record is loaded a second time, isLoaded stays true", function() {
+  store.load(Person, { id: 1, name: "Tom Dale" });
+
+  var person = store.find(Person, 1);
+
+  equal(get(person, 'isLoaded'), true, "The person is loaded");
+
+  function isLoadedDidChange() {
+    // This shouldn't be hit
+    equal(get(person, 'isLoaded'), true, "The person is still loaded after change");
+  }
+  person.addObserver('isLoaded', isLoadedDidChange);
+
+  // Reload the record
+  store.load(Person, { id: 1, name: "Tom Dale" });
+  equal(get(person, 'isLoaded'), true, "The person is still loaded after load");
+
+  person.removeObserver('isLoaded', isLoadedDidChange);
+
+  start();
+
+});