Instead, create registry with isolated resolver

emberjs · Dec 7, 2015 · 4350ead · 4350ead
1 parent f9ae254
commit 4350ead
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/lib/ember-test-helpers/test-module.js b/lib/ember-test-helpers/test-module.js
@@ -267,9 +267,14 @@ export default Klass.extend({
     }
   },
 
-  _setupContainer: function() {
+  _setupContainer: function(isolated) {
     var resolver = getResolver();
-    var items = buildRegistry(resolver);
+
+    var items = buildRegistry(!isolated ? resolver : Object.create(resolver, {
+      resolve: {
+        value: function() {}
+      }
+    }));
 
     this.container = items.container;
     this.registry = items.registry;
@@ -284,7 +289,7 @@ export default Klass.extend({
 
   _setupIsolatedContainer: function() {
     var resolver = getResolver();
-    this._setupContainer();
+    this._setupContainer(true);
 
     var thingToRegisterWith = this.registry || this.container;
 
@@ -294,12 +299,7 @@ export default Klass.extend({
       thingToRegisterWith.register(fullName, resolver.resolve(normalizedFullName));
     }
 
-    if (this.registry) {
-      this.registry.fallback.resolver = function() {};
-      if (hasEmberVersion(2,3)) {
-        this.registry.fallback.resolver.resolve = function() {};
-      }
-    } else {
+    if (!this.registry) {
       this.container.resolver = function() {};
     }
   },