[BUGFIX beta] Initializer/Instance Initializer Deprecations.

packages/ember-data/lib/initializers/store.js

@@ -2,15 +2,24 @@ import Store from "ember-data/system/store";
 import { JSONAPISerializer, JSONSerializer, RESTSerializer } from "ember-data/serializers";
 import { JSONAPIAdapter, RESTAdapter } from "ember-data/adapters";
 
+function has(applicationOrRegistry, fullName) {
+  if (applicationOrRegistry.has) {
+    // < 2.1.0
+    return applicationOrRegistry.has(fullName);
+  } else {
+    // 2.1.0+
+    return applicationOrRegistry.hasRegistration(fullName);
+  }
+}
+
 /**
   Configures a registry for use with an Ember-Data
   store. Accepts an optional namespace argument.
 
   @method initializeStore
   @param {Ember.Registry} registry
-  @param {Object} [application] an application namespace
 */
-export default function initializeStore(registry, application) {
+export default function initializeStore(registry) {
   registry.optionsForType('serializer', { singleton: false });
   registry.optionsForType('adapter', { singleton: false });
 
@@ -22,7 +31,7 @@ export default function initializeStore(registry, application) {
   registry.register('serializer:-json-api', JSONAPISerializer);
 
 
-  if (!registry.has('service:store')) {
+  if (has(registry, 'service:store')) {
     registry.register('service:store', Store);
   }
 }

packages/ember-data/lib/instance-initializers/initialize-store-service.js

@@ -6,7 +6,7 @@
  @param {Ember.ApplicationInstance} applicationOrRegistry
  */
 export default function initializeStoreService(application) {
-  var container = application.container;
+  var container = application.lookup ? application : application.container;
   // Eagerly generate the store so defaultStore is populated.
   container.lookup('service:store');
 }

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

@@ -3,13 +3,9 @@ import initializeTransforms from 'ember-data/initializers/transforms';
 import initializeStoreInjections from 'ember-data/initializers/store-injections';
 import initializeDataAdapter from 'ember-data/initializers/data-adapter';
 
-export default function setupContainer(registry, application) {
-  // application is not a required argument. This ensures
-  // testing setups can setup a container without booting an
-  // entire ember application.
-
-  initializeDataAdapter(registry, application);
-  initializeTransforms(registry, application);
-  initializeStoreInjections(registry, application);
-  initializeStore(registry, application);
+export default function setupContainer(application) {
+  initializeDataAdapter(application);
+  initializeTransforms(application);
+  initializeStoreInjections(application);
+  initializeStore(application);
 }