fix canary build for recent Ember.Container refactors

refactors: emberjs/ember.js#9981

.travis.yml

@@ -10,7 +10,7 @@ install:
 script:
   - npm run-script test
   - npm run-script testem-beta
-#  - npm run-script testem-canary
+  - npm run-script testem-canary
 after_success:
 - npm run-script publish-build
 - "./bin/bower-ember-data-build"

packages/ember-data/tests/unit/store/create_record_test.js

@@ -28,12 +28,11 @@ module("unit/store/createRecord - Store with models by dash", {
     });
     store = env.store;
     container = env.container;
-    container.normalize = function(key){
+    env.replaceContainerNormalize(function(key){
       return Ember.String.dasherize(key);
-    };
+    });
   }
 });
-
 test("creating a record by camel-case string finds the model", function(){
   var attributes = { foo: 'bar' };
   var record;
@@ -65,9 +64,7 @@ module("unit/store/createRecord - Store with models by camelCase", {
     });
     store = env.store;
     container = env.container;
-    container.normalize = function(key){
-      return Ember.String.camelize(key);
-    };
+    env.replaceContainerNormalize(Ember.String.camelize);
   }
 });
 

packages/ember-data/tests/unit/store/model_for_test.js

@@ -4,13 +4,15 @@ var camelize  = Ember.String.camelize,
     dasherize = Ember.String.dasherize;
 
 var run = Ember.run;
+var env;
 
 module("unit/store/model_for - DS.Store#modelFor", {
   setup: function() {
-    store = createStore({
+    env = setupStore({
       blogPost: DS.Model.extend(),
       "blog-post": DS.Model.extend()
     });
+    store = env.store;
     container = store.container;
   },
 
@@ -23,18 +25,16 @@ module("unit/store/model_for - DS.Store#modelFor", {
 });
 
 test("when fetching factory from string, sets a normalized key as typeKey", function() {
-  container.normalize = function(fullName){
-    return camelize(fullName);
-  };
+  env.replaceContainerNormalize(camelize);
 
   equal(container.normalize('some.post'), 'somePost', 'precond - container camelizes');
   equal(store.modelFor("blog.post").typeKey, "blogPost", "typeKey is normalized to camelCase");
 });
 
 test("when fetching factory from string and dashing normalizer, sets a normalized key as typeKey", function() {
-  container.normalize = function(fullName){
+  env.replaceContainerNormalize(function(fullName){
     return dasherize(camelize(fullName));
-  };
+  });
 
   equal(container.normalize('some.post'), 'some-post', 'precond - container dasherizes');
   equal(store.modelFor("blog.post").typeKey, "blogPost", "typeKey is normalized to camelCase");

tests/ember_configuration.js

@@ -52,6 +52,22 @@
 
     var container = env.container = new Ember.Container();
 
+    // We have to currently work around some container refactors until
+    // https://github.com/emberjs/ember.js/pull/9981 is on the stable release
+    // of ember
+    if (typeof Ember.Registry !== 'undefined') {
+      var registry = new Ember.Registry();
+      container._registry = registry;
+      env.registry = registry;
+    }
+    env.replaceContainerNormalize = function replaceContainerNormalize(fn) {
+      if (env.registry) {
+        env.registry.normalize = fn;
+      } else {
+        env.container.normalize = fn;
+      }
+    }
+
     var adapter = env.adapter = (options.adapter || DS.Adapter);
     delete options.adapter;