[CHORE]: eliminate initializer logic not needed after setupStore removed

packages/-ember-data/addon/setup-container.js

@@ -1,18 +1,6 @@
 import { DebugAdapter } from './-private';
 import Store from '@ember-data/store';
 
-function hasRegistration(application, registrationName) {
-  // fallback our ember-data tests necessary
-  // until we kill-off setupStore
-  // see https://github.com/emberjs/data/issues/6357
-  // or @ember/test-helpers kills off it's
-  // legacy support that calls our initializer with registry
-  // instead of application
-  if (typeof application.hasRegistration !== 'function') {
-    return application.has(registrationName);
-  }
-  return application.hasRegistration(registrationName);
-}
 /*
  Configures a registry for use with an Ember-Data
  store. Accepts an optional namespace argument.
@@ -21,13 +9,10 @@ function hasRegistration(application, registrationName) {
  @param {Ember.Registry} registry
  */
 function initializeStore(application) {
-  // we can just use registerOptionsForType when setupStore is killed
-  // see https://github.com/emberjs/data/issues/6357
-  let registerOptionsForType = application.registerOptionsForType || application.optionsForType;
-  registerOptionsForType.call(application, 'serializer', { singleton: false });
-  registerOptionsForType.call(application, 'adapter', { singleton: false });
+  application.registerOptionsForType('serializer', { singleton: false });
+  application.registerOptionsForType('adapter', { singleton: false });
 
-  if (!hasRegistration(application, 'service:store')) {
+  if (!application.hasRegistration('service:store')) {
     application.register('service:store', Store);
   }
 }

packages/-ember-data/tests/dummy/config/environment.js

@@ -34,6 +34,7 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   return ENV;

packages/-ember-data/tests/integration/application-test.js

@@ -15,6 +15,7 @@ module('integration/application - Injecting a Custom Store', function(hooks) {
   hooks.beforeEach(function() {
     let { owner } = this;
 
+    owner.unregister('service:store');
     owner.register('service:store', Store.extend({ isCustom: true }));
     owner.register('controller:foo', Controller.extend());
     owner.register('controller:baz', {});

packages/-ember-data/tests/integration/record-data/record-data-test.ts

@@ -135,6 +135,7 @@ module('integration/record-data - Custom RecordData Implementations', function(h
 
     owner.register('model:person', Person);
     owner.register('model:house', House);
+    owner.unregister('service:store');
     owner.register('service:store', CustomStore);
   });
 

packages/-ember-data/tests/integration/record-data/store-wrapper-test.ts

@@ -118,6 +118,7 @@ module('integration/store-wrapper - RecordData StoreWrapper tests', function(hoo
     owner.register('model:person', Person);
     owner.register('model:house', House);
     owner.register('model:car', Car);
+    owner.unregister('service:store');
     owner.register('service:store', CustomStore);
   });
 

packages/-ember-data/tests/test-helper.js

@@ -1,15 +1,14 @@
+import Application from '../app';
+import config from '../config/environment';
 import RSVP from 'rsvp';
-import resolver from './helpers/resolver';
-import { setResolver } from '@ember/test-helpers';
+import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
 
 import QUnit from 'qunit';
 import DS from 'ember-data';
 import { wait, asyncEqual, invokeAsync } from 'dummy/tests/helpers/async';
 
-// TODO get us to a setApplication world instead
-//   seems to require killing off createStore
-setResolver(resolver);
+setApplication(Application.create(config.APP));
 
 const { assert } = QUnit;
 const transforms = {