Default to using the JSONAPIAdapter

emberjs · Jul 3, 2015 · 97a9d7e · 97a9d7e
1 parent acee775
commit 97a9d7e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/packages/ember-data/lib/system/store.js b/packages/ember-data/lib/system/store.js
@@ -238,7 +238,7 @@ Store = Service.extend({
     @default DS.RESTAdapter
     @type {(DS.Adapter|String)}
   */
-  adapter: '-rest',
+  adapter: '-json-api',
 
   /**
     Returns a JSON representation of the record using a custom
@@ -2212,7 +2212,7 @@ Store = Service.extend({
 
   _adapterFallbacks: Ember.computed('adapter', function() {
     var adapter = this.get('adapter');
-    return ['application', adapter, '-rest'];
+    return ['application', adapter, '-json-api'];
   }),
 
   lookupSerializer: function(name, fallbacks) {

diff --git a/packages/ember-data/lib/system/store/container-instance-cache.js b/packages/ember-data/lib/system/store/container-instance-cache.js
@@ -52,10 +52,6 @@ Ember.merge(ContainerInstanceCache.prototype, {
   },
 
   instanceFor: function(key) {
-    if (key === 'adapter:-rest') {
-      Ember.deprecate('You are currently using the default DS.RESTAdapter adapter. For Ember 2.0 the default adapter will be DS.JSONAPIAdapter. If you would like to continue using DS.RESTAdapter please create an application adapter that extends DS.RESTAdapter.');
-    }
-
     let cache = this._cache;
     if (!cache[key]) {
       let instance = this._container.lookup(key);

diff --git a/packages/ember-data/tests/integration/application-test.js b/packages/ember-data/tests/integration/application-test.js
@@ -76,6 +76,17 @@ test("registering App.Store is deprecated but functional", function() {
   });
 });
 
+test("The JSONAPIAdapter is the default adapter when no custom adapter is provided", function() {
+  run(function() {
+    var store = getStore();
+
+    var adapter = store.adapterFor('application');
+
+    ok(adapter instanceof DS.JSONAPIAdapter, 'default adapter should be the JSONAPIAdapter');
+  });
+});
+
+
 module("integration/application - Injecting the Default Store", {
   setup: function() {
     run(function() {