updated to ember-data.1.0.0-beta.16

adopted-ember-addons · Mar 23, 2015 · 24faf2a · 24faf2a
1 parent 7b2482c
commit 24faf2a
Show file tree

Hide file tree

Showing 9 changed files with 241 additions and 243 deletions.
diff --git a/bower.json b/bower.json
@@ -15,7 +15,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "ember-data": "1.0.0-beta.15",
+    "ember-data": "1.0.0-beta.16",
     "jquery-mockjax": "latest"
   },
   "ignore": [

diff --git a/dist/amd/factory-guy.js b/dist/amd/factory-guy.js
@@ -505,9 +505,9 @@ var FactoryGuy = {
       definition.reset();
       try {
         var modelType = store.modelFor(definition.model);
-        if (store.usingFixtureAdapter()) {
-          modelType.FIXTURES = [];
-        }
+        //if (store.usingFixtureAdapter()) {
+        //  modelType.FIXTURES = [];
+        //}
         store.unloadAll(modelType);
       } catch (e) {
         console.log('resetModels',e)
@@ -715,7 +715,7 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
      @returns {Boolean} true if store's adapter is DS.FixtureAdapter
      */
     usingFixtureAdapter: function () {
-      var adapter = this.adapterFor('application');
+      var adapter = this.lookupAdapter('application');
       return adapter instanceof DS.FixtureAdapter;
     },
     /**

diff --git a/dist/ember-data-factory-guy.js b/dist/ember-data-factory-guy.js
@@ -500,9 +500,9 @@ var FactoryGuy = {
       definition.reset();
       try {
         var modelType = store.modelFor(definition.model);
-        if (store.usingFixtureAdapter()) {
-          modelType.FIXTURES = [];
-        }
+        //if (store.usingFixtureAdapter()) {
+        //  modelType.FIXTURES = [];
+        //}
         store.unloadAll(modelType);
       } catch (e) {
         console.log('resetModels',e)
@@ -710,7 +710,7 @@ var MockUpdateRequest = function(url, model, mapFind, options) {
      @returns {Boolean} true if store's adapter is DS.FixtureAdapter
      */
     usingFixtureAdapter: function () {
-      var adapter = this.adapterFor('application');
+      var adapter = this.lookupAdapter('application');
       return adapter instanceof DS.FixtureAdapter;
     },
     /**

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
@@ -321,9 +321,9 @@ var FactoryGuy = {
       definition.reset();
       try {
         var modelType = store.modelFor(definition.model);
-        if (store.usingFixtureAdapter()) {
-          modelType.FIXTURES = [];
-        }
+        //if (store.usingFixtureAdapter()) {
+        //  modelType.FIXTURES = [];
+        //}
         store.unloadAll(modelType);
       } catch (e) {
         console.log('resetModels',e)

diff --git a/src/store.js b/src/store.js
@@ -4,7 +4,7 @@
      @returns {Boolean} true if store's adapter is DS.FixtureAdapter
      */
     usingFixtureAdapter: function () {
-      var adapter = this.adapterFor('application');
+      var adapter = this.lookupAdapter('application');
       return adapter instanceof DS.FixtureAdapter;
     },
     /**

diff --git a/tests/index.html b/tests/index.html
@@ -9,8 +9,7 @@
     <link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css">
     <!-- add any external libraries your code needs -->
     <script src='../bower_components/jquery/jquery.js'></script>
-    <script src='../bower_components/handlebars/handlebars.js'></script>
-    <script src='../bower_components/ember/ember.js'></script>
+    <script src='../bower_components/ember/ember.debug.js'></script>
     <script src='../bower_components/ember-data/ember-data.js'></script>
     <script src="../bower_components/qunit/qunit/qunit.js"></script>
     <script src="../bower_components/sinon/index.js"></script>
@@ -27,11 +26,11 @@
 </head>
 <body>
 <div id="qunit"></div> <!-- QUnit fills this with results, etc -->
-<!--<script src='active_model_adapter_factory_test.js'></script>-->
-<!--<script src='rest_adapter_factory_test.js'></script>-->
+<script src='active_model_adapter_factory_test.js'></script>
+<script src='rest_adapter_factory_test.js'></script>
 <!--<script src='fixture_adapter_factory_test.js'></script>-->
-<!--<script src='store_test.js'></script>-->
-<!--<script src='factory_guy_test.js'></script>-->
+<script src='store_test.js'></script>
+<script src='factory_guy_test.js'></script>
 <script src='factory_guy_test_mixin_test.js'></script>
 <div id='qunit-fixture'>