[INTERNAL]: replace -rest adapter usage

emberjs · Aug 18, 2019 · 74ba19f · 74ba19f
1 parent 39182f3
commit 74ba19f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 103 deletions.
diff --git a/packages/-ember-data/tests/integration/store/adapter-for-test.js b/packages/-ember-data/tests/integration/store/adapter-for-test.js
@@ -153,108 +153,6 @@ module('integration/store - adapterFor', function(hooks) {
     assert.ok(appAdapter === adapter, 'We fell back to the application adapter instance');
   });
 
-  test('we can specify a fallback adapter by name in place of the application adapter', async function(assert) {
-    store.adapter = '-rest';
-    let { owner } = this;
-
-    let didInstantiateRestAdapter = false;
-
-    class RestAdapter extends TestAdapter {
-      didInit() {
-        didInstantiateRestAdapter = true;
-      }
-    }
-    owner.register('adapter:-rest', RestAdapter);
-
-    let adapter = store.adapterFor('person');
-
-    assert.ok(adapter instanceof RestAdapter, 'We found the fallback -rest adapter for person');
-    assert.ok(didInstantiateRestAdapter, 'We instantiated the adapter');
-    didInstantiateRestAdapter = false;
-
-    let appAdapter = store.adapterFor('application');
-
-    assert.ok(appAdapter instanceof RestAdapter, 'We found the fallback -rest adapter for application');
-    assert.ok(!didInstantiateRestAdapter, 'We did not instantiate the adapter again');
-    didInstantiateRestAdapter = false;
-
-    let restAdapter = store.adapterFor('-rest');
-    assert.ok(restAdapter instanceof RestAdapter, 'We found the correct adapter');
-    assert.ok(!didInstantiateRestAdapter, 'We did not instantiate the adapter again');
-    assert.ok(restAdapter === adapter, 'We fell back to the -rest adapter instance for the person adapters');
-    assert.ok(restAdapter === appAdapter, 'We fell back to the -rest adapter instance for the application adapter');
-  });
-
-  test('the application adapter has higher precedence than a fallback adapter defined via store.adapter', async function(assert) {
-    store.adapter = '-rest';
-    let { owner } = this;
-
-    let didInstantiateAppAdapter = false;
-    let didInstantiateRestAdapter = false;
-
-    class AppAdapter extends TestAdapter {
-      didInit() {
-        didInstantiateAppAdapter = true;
-      }
-    }
-
-    class RestAdapter extends TestAdapter {
-      didInit() {
-        didInstantiateRestAdapter = true;
-      }
-    }
-
-    owner.register('adapter:application', AppAdapter);
-    owner.register('adapter:-rest', RestAdapter);
-
-    let adapter = store.adapterFor('person');
-
-    assert.ok(adapter instanceof AppAdapter, 'We found the store specified fallback adapter');
-    assert.ok(!didInstantiateRestAdapter, 'We did not instantiate the store.adapter (-rest) adapter');
-    assert.ok(didInstantiateAppAdapter, 'We instantiated the application adapter');
-    didInstantiateRestAdapter = false;
-    didInstantiateAppAdapter = false;
-
-    let appAdapter = store.adapterFor('application');
-    assert.ok(appAdapter instanceof AppAdapter, 'We found the correct adapter for application');
-    assert.ok(!didInstantiateRestAdapter, 'We did not instantiate the store fallback adapter');
-    assert.ok(!didInstantiateAppAdapter, 'We did not instantiate the application adapter again');
-    assert.ok(appAdapter === adapter, 'We used the application adapter as the person adapter');
-    didInstantiateRestAdapter = false;
-    didInstantiateAppAdapter = false;
-
-    let restAdapter = store.adapterFor('-rest');
-    assert.ok(restAdapter instanceof RestAdapter, 'We found the correct adapter for -rest');
-    assert.ok(!didInstantiateAppAdapter, 'We did not instantiate the application adapter again');
-    assert.ok(didInstantiateRestAdapter, 'We instantiated the fallback adapter');
-    assert.ok(restAdapter !== appAdapter, `We did not use the application adapter instance`);
-  });
-
-  test('we can specify a fallback adapter by name in place of the application adapter', async function(assert) {
-    store.adapter = '-rest';
-    let { owner } = this;
-
-    let didInstantiateRestAdapter = false;
-
-    class RestAdapter extends TestAdapter {
-      didInit() {
-        didInstantiateRestAdapter = true;
-      }
-    }
-    owner.register('adapter:-rest', RestAdapter);
-
-    let adapter = store.adapterFor('application');
-
-    assert.ok(adapter instanceof RestAdapter, 'We found the adapter');
-    assert.ok(didInstantiateRestAdapter, 'We instantiated the adapter');
-    didInstantiateRestAdapter = false;
-
-    let restAdapter = store.adapterFor('-rest');
-    assert.ok(restAdapter instanceof RestAdapter, 'We found the correct adapter');
-    assert.ok(!didInstantiateRestAdapter, 'We did not instantiate the adapter again');
-    assert.ok(restAdapter === adapter, 'We fell back to the -rest adapter instance for the application adapter');
-  });
-
   test('When the per-type, application and specified fallback adapters do not exist, we fallback to the -json-api adapter', async function(assert) {
     store.adapter = '-not-a-real-adapter';
     let { owner } = this;

diff --git a/packages/-ember-data/tests/unit/store/adapter-interop-test.js b/packages/-ember-data/tests/unit/store/adapter-interop-test.js
@@ -32,7 +32,7 @@ module('unit/store/adapter-interop - DS.Store working with a DS.Adapter', functi
   });
 
   test('Adapter can be set as a name', function(assert) {
-    store = createStore({ adapter: '-rest' });
+    store = createStore({ adapter: 'application' });
 
     assert.ok(store.get('defaultAdapter') instanceof DS.RESTAdapter);
   });