Fixtures inserted with equivalent ids get updated

dist/amd/factory-guy.js

@@ -441,12 +441,45 @@ var FactoryGuy = {
    @returns {Object} json fixture data
    */
   pushFixture: function (modelClass, fixture) {
+    var index;
     if (!modelClass.FIXTURES) {
       modelClass.FIXTURES = [];
     }
-    modelClass.FIXTURES.push(fixture);
+
+    index = this.indexOfFixture(modelClass.FIXTURES, fixture);
+
+    if (index > -1) {
+      modelClass.FIXTURES[index] = fixture;
+    } else {
+      modelClass.FIXTURES.push(fixture);
+    }
+
     return fixture;
   },
+
+  /**
+   Used in compliment with pushFixture in order to
+   ensure we don't push duplicate fixtures
+
+   @private
+   @param {Array} fixtures
+   @param {String|Integer} id of fixture to find
+   @returns {Object} fixture
+   */
+  indexOfFixture: function(fixtures, fixture) {
+    var index = -1,
+        id = fixture.id + '';
+    Ember.A(fixtures).find(function(r, i) {
+      if ('' + Ember.get(r, 'id') === id) {
+        index = i;
+        return true;
+      } else {
+        return false;
+      }
+    });
+    return index;
+  },
+
   /**
    Clears all model definitions
   */

dist/ember-data-factory-guy.js

@@ -436,12 +436,45 @@ var FactoryGuy = {
    @returns {Object} json fixture data
    */
   pushFixture: function (modelClass, fixture) {
+    var index;
     if (!modelClass.FIXTURES) {
       modelClass.FIXTURES = [];
     }
-    modelClass.FIXTURES.push(fixture);
+
+    index = this.indexOfFixture(modelClass.FIXTURES, fixture);
+
+    if (index > -1) {
+      modelClass.FIXTURES[index] = fixture;
+    } else {
+      modelClass.FIXTURES.push(fixture);
+    }
+
     return fixture;
   },
+
+  /**
+   Used in compliment with pushFixture in order to
+   ensure we don't push duplicate fixtures
+
+   @private
+   @param {Array} fixtures
+   @param {String|Integer} id of fixture to find
+   @returns {Object} fixture
+   */
+  indexOfFixture: function(fixtures, fixture) {
+    var index = -1,
+        id = fixture.id + '';
+    Ember.A(fixtures).find(function(r, i) {
+      if ('' + Ember.get(r, 'id') === id) {
+        index = i;
+        return true;
+      } else {
+        return false;
+      }
+    });
+    return index;
+  },
+
   /**
    Clears all model definitions
   */

src/factory_guy.js

@@ -268,12 +268,45 @@ var FactoryGuy = {
    @returns {Object} json fixture data
    */
   pushFixture: function (modelClass, fixture) {
+    var index;
     if (!modelClass.FIXTURES) {
       modelClass.FIXTURES = [];
     }
-    modelClass.FIXTURES.push(fixture);
+
+    index = this.indexOfFixture(modelClass.FIXTURES, fixture);
+
+    if (index > -1) {
+      modelClass.FIXTURES[index] = fixture;
+    } else {
+      modelClass.FIXTURES.push(fixture);
+    }
+
     return fixture;
   },
+
+  /**
+   Used in compliment with pushFixture in order to
+   ensure we don't push duplicate fixtures
+
+   @private
+   @param {Array} fixtures
+   @param {String|Integer} id of fixture to find
+   @returns {Object} fixture
+   */
+  indexOfFixture: function(fixtures, fixture) {
+    var index = -1,
+        id = fixture.id + '';
+    Ember.A(fixtures).find(function(r, i) {
+      if ('' + Ember.get(r, 'id') === id) {
+        index = i;
+        return true;
+      } else {
+        return false;
+      }
+    });
+    return index;
+  },
+
   /**
    Clears all model definitions
   */
@@ -282,4 +315,4 @@ var FactoryGuy = {
       this.modelDefinitions = {};
     }
   }
-};
+};

tests/factory_guy_test.js

@@ -203,3 +203,26 @@ test("#lookupModelForFixtureName", function() {
   equal(FactoryGuy.lookupModelForFixtureName('fake'), undefined, "return nothing if can't find definition");
 });
 
+asyncTest("#pushFixture", function() {
+  var User = store.modelFor('user'),
+      user = store.makeFixture('user'),
+      duplicateUser = FactoryGuy.build('user', { id: user.id, name: 'monkey' }),
+      differentUser = FactoryGuy.build('user'),
+      usersById = {};
+
+  usersById[duplicateUser.id] = duplicateUser;
+  usersById[differentUser.id] = differentUser;
+
+  FactoryGuy.pushFixture(User, duplicateUser);
+  FactoryGuy.pushFixture(User, differentUser);
+
+  store.find('user').then(function(users) {
+    ok(users.get('length') === 2);
+
+    users.forEach(function(user) {
+      equal(user.get('name'), usersById[user.get('id')].name, "Updates model fixture if duplicate id found");
+    });
+
+    start();
+  });
+});

vendor/assets/javascripts/ember_data_factory_guy.js

@@ -436,12 +436,45 @@ var FactoryGuy = {
    @returns {Object} json fixture data
    */
   pushFixture: function (modelClass, fixture) {
+    var index;
     if (!modelClass.FIXTURES) {
       modelClass.FIXTURES = [];
     }
-    modelClass.FIXTURES.push(fixture);
+
+    index = this.indexOfFixture(modelClass.FIXTURES, fixture);
+
+    if (index > -1) {
+      modelClass.FIXTURES[index] = fixture;
+    } else {
+      modelClass.FIXTURES.push(fixture);
+    }
+
     return fixture;
   },
+
+  /**
+   Used in compliment with pushFixture in order to
+   ensure we don't push duplicate fixtures
+
+   @private
+   @param {Array} fixtures
+   @param {String|Integer} id of fixture to find
+   @returns {Object} fixture
+   */
+  indexOfFixture: function(fixtures, fixture) {
+    var index = -1,
+        id = fixture.id + '';
+    Ember.A(fixtures).find(function(r, i) {
+      if ('' + Ember.get(r, 'id') === id) {
+        index = i;
+        return true;
+      } else {
+        return false;
+      }
+    });
+    return index;
+  },
+
   /**
    Clears all model definitions
   */
@@ -1023,9 +1056,6 @@ if (FactoryGuy !== undefined) {
 		}
 		// Inspect the data submitted in the request (either POST body or GET query string)
 		if ( handler.data ) {
-//      console.log('request.data', requestSettings.data )
-//      console.log('handler.data', handler.data )
-//      console.log('data equal', isMockDataEqual(handler.data, requestSettings.data) )
 			if ( ! requestSettings.data || !isMockDataEqual(handler.data, requestSettings.data) ) {
 				// They're not identical, do not mock this request
 				return null;