Merge pull request #41 from ksykulev/cleanup-push-fixture

Cleaning up pushFixture.
adopted-ember-addons · Dec 10, 2014 · d51e4ba · d51e4ba
2 parents 3714067 + 6b61dc9
commit d51e4ba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/dist/amd/factory-guy.js b/dist/amd/factory-guy.js
@@ -449,11 +449,11 @@ var FactoryGuy = {
     index = this.indexOfFixture(modelClass.FIXTURES, fixture);
 
     if (index > -1) {
-      modelClass.FIXTURES[index] = fixture;
-    } else {
-      modelClass.FIXTURES.push(fixture);
+      modelClass.FIXTURES.splice(index, 1);
     }
 
+    modelClass.FIXTURES.push(fixture);
+
     return fixture;
   },
 

diff --git a/dist/ember-data-factory-guy.js b/dist/ember-data-factory-guy.js
@@ -444,11 +444,11 @@ var FactoryGuy = {
     index = this.indexOfFixture(modelClass.FIXTURES, fixture);
 
     if (index > -1) {
-      modelClass.FIXTURES[index] = fixture;
-    } else {
-      modelClass.FIXTURES.push(fixture);
+      modelClass.FIXTURES.splice(index, 1);
     }
 
+    modelClass.FIXTURES.push(fixture);
+
     return fixture;
   },
 

diff --git a/dist/ember-data-factory-guy.min.js b/dist/ember-data-factory-guy.min.js
diff --git a/src/factory_guy.js b/src/factory_guy.js
@@ -276,11 +276,11 @@ var FactoryGuy = {
     index = this.indexOfFixture(modelClass.FIXTURES, fixture);
 
     if (index > -1) {
-      modelClass.FIXTURES[index] = fixture;
-    } else {
-      modelClass.FIXTURES.push(fixture);
+      modelClass.FIXTURES.splice(index, 1);
     }
 
+    modelClass.FIXTURES.push(fixture);
+
     return fixture;
   },
 

diff --git a/vendor/assets/javascripts/ember_data_factory_guy.js b/vendor/assets/javascripts/ember_data_factory_guy.js
@@ -444,11 +444,11 @@ var FactoryGuy = {
     index = this.indexOfFixture(modelClass.FIXTURES, fixture);
 
     if (index > -1) {
-      modelClass.FIXTURES[index] = fixture;
-    } else {
-      modelClass.FIXTURES.push(fixture);
+      modelClass.FIXTURES.splice(index, 1);
     }
 
+    modelClass.FIXTURES.push(fixture);
+
     return fixture;
   },