From bc63036f1a1a4aa1f8ab0abb9228a26ebc99f63a Mon Sep 17 00:00:00 2001
From: Robert Jackson <robert.w.jackson@me.com>
Date: Tue, 21 Jul 2015 17:13:53 -0400
Subject: [PATCH] Avoid using container.register.

---
 lib/ember-test-helpers/test-module-for-component.js | 6 +++---
 lib/ember-test-helpers/test-module-for-model.js     | 4 +++-
 tests/test-module-test.js                           | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/ember-test-helpers/test-module-for-component.js b/lib/ember-test-helpers/test-module-for-component.js
index 466cab083..f1409b980 100644
--- a/lib/ember-test-helpers/test-module-for-component.js
+++ b/lib/ember-test-helpers/test-module-for-component.js
@@ -47,16 +47,16 @@ export default TestModule.extend({
   setupComponentUnitTest: function() {
     var _this = this;
     var resolver = getResolver();
-    var container = this.container;
     var context = this.context;
 
     var layoutName = 'template:components/' + this.componentName;
 
     var layout = resolver.resolve(layoutName);
 
+    var thingToRegisterWith = this.registry || this.container;
     if (layout) {
-      container.register(layoutName, layout);
-      container.injection(this.subjectName, 'layout', layoutName);
+      thingToRegisterWith.register(layoutName, layout);
+      thingToRegisterWith.injection(this.subjectName, 'layout', layoutName);
     }
 
     context.dispatcher = Ember.EventDispatcher.create();
diff --git a/lib/ember-test-helpers/test-module-for-model.js b/lib/ember-test-helpers/test-module-for-model.js
index 178067bf5..2a9e3b701 100644
--- a/lib/ember-test-helpers/test-module-for-model.js
+++ b/lib/ember-test-helpers/test-module-for-model.js
@@ -19,7 +19,9 @@ export default TestModule.extend({
     var adapterFactory = container.lookupFactory('adapter:application');
     if (!adapterFactory) {
       adapterFactory = DS.JSONAPIAdapter || DS.FixtureAdapter;
-      container.register('adapter:application', adapterFactory);
+
+      var thingToRegisterWith = this.registry || this.container;
+      thingToRegisterWith.register('adapter:application', adapterFactory);
     }
 
     callbacks.store = function(){
diff --git a/tests/test-module-test.js b/tests/test-module-test.js
index 5ee92ea00..6c2c5623e 100644
--- a/tests/test-module-test.js
+++ b/tests/test-module-test.js
@@ -69,7 +69,8 @@ moduleFor('component:x-foo', 'component:x-foo -- setup context', {
       name: 'Max'
     });
 
-    this.container.register('service:blah', Ember.Object.extend({
+    var thingToRegisterWith = this.registry || this.container;
+    thingToRegisterWith.register('service:blah', Ember.Object.extend({
       purpose: 'blabering'
     }));
   }