Update to latest ember-data-factory-guy

Aperta-project · May 6, 2015 · d6e0c77 · d6e0c77
1 parent 1b7a3df
commit d6e0c77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/client/bower.json b/client/bower.json
@@ -20,10 +20,10 @@
     "sinon": "http://sinonjs.org/releases/sinon-1.12.1.js",
     "underscore": "~1.7.0",
     "bootstrap-datepicker": "1.3.1",
-    "ember-data-factory-guy": "0.9.10",
     "font-awesome": "~4.3.0",
     "jquery-ui": "~1.11.3",
-    "bootstrap": "~3.3.2"
+    "bootstrap": "~3.3.2",
+    "jquery-mockjax": "~1.6.2"
   },
   "resolutions": {
     "ember-data": "1.0.0-beta.16.1"

diff --git a/client/package.json b/client/package.json
@@ -20,7 +20,6 @@
     "ember-cli-babel": "^5.0.0",
     "ember-cli-coffeescript": "~0.4.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-data-factory-guy": "^0.9.1",
     "ember-cli-dependency-checker": "0.0.8",
     "ember-cli-font-awesome": "0.0.9",
     "ember-cli-htmlbars": "0.7.4",
@@ -31,6 +30,7 @@
     "ember-cli-uglify": "1.0.1",
     "ember-cli-visualeditor": "substance/ember-cli-visualeditor.git#85449868e49dae0b62a11a70b7998ecd01fc0837",
     "ember-data": "1.0.0-beta.16.1",
+    "ember-data-factory-guy": "1.0.7",
     "ember-export-application-global": "^1.0.2",
     "broccoli-merge-trees": "0.2.1",
     "broccoli-static-compiler": "0.2.1",