Merge pull request #39 from bmac/register-store-service

Delegate to DS._setupContainer when available to register service:store
emberjs · Apr 28, 2015 · 835c54b · 835c54b
2 parents 532da8c + 1ea3671
commit 835c54b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/lib/ember-test-helpers/isolated-container.js b/lib/ember-test-helpers/isolated-container.js
@@ -69,13 +69,17 @@ export default function isolatedContainer(fullNames) {
   var globalContext = typeof global === 'object' && global || self;
   if (globalContext.DS) {
     var DS = globalContext.DS;
-    container.register('transform:boolean', DS.BooleanTransform);
-    container.register('transform:date', DS.DateTransform);
-    container.register('transform:number', DS.NumberTransform);
-    container.register('transform:string', DS.StringTransform);
-    container.register('serializer:-default', DS.JSONSerializer);
-    container.register('serializer:-rest', DS.RESTSerializer);
-    container.register('adapter:-rest', DS.RESTAdapter);
+    if (DS._setupContainer) {
+      DS._setupContainer(container);
+    } else {
+      container.register('transform:boolean', DS.BooleanTransform);
+      container.register('transform:date', DS.DateTransform);
+      container.register('transform:number', DS.NumberTransform);
+      container.register('transform:string', DS.StringTransform);
+      container.register('serializer:-default', DS.JSONSerializer);
+      container.register('serializer:-rest', DS.RESTSerializer);
+      container.register('adapter:-rest', DS.RESTAdapter);
+    }
   }
 
   for (var i = fullNames.length; i > 0; i--) {

diff --git a/lib/ember-test-helpers/test-module-for-model.js b/lib/ember-test-helpers/test-module-for-model.js
@@ -16,12 +16,6 @@ export default TestModule.extend({
     var callbacks = this.callbacks;
     var modelName = this.modelName;
 
-    if (DS._setupContainer) {
-      DS._setupContainer(container);
-    } else {
-      container.register('store:main', DS.Store);
-    }
-
     var adapterFactory = container.lookupFactory('adapter:application');
     if (!adapterFactory) {
       container.register('adapter:application', DS.FixtureAdapter);