Allow overriding services/factories in the registry.

lib/ember-test-helpers/build-registry.js

@@ -27,7 +27,7 @@ function exposeRegistryMethodsWithoutDeprecations(container) {
 }
 
 export default function(resolver) {
-  var registry, container;
+  var fallbackRegistry, registry, container;
   var namespace = Ember.Object.create({
     Resolver: { create: function() { return resolver; } }
   });
@@ -41,10 +41,12 @@ export default function(resolver) {
   }
 
   if (Ember.Application.buildRegistry) {
-    registry = Ember.Application.buildRegistry(namespace);
-    registry.register('component-lookup:main', Ember.ComponentLookup);
+    fallbackRegistry = Ember.Application.buildRegistry(namespace);
+    fallbackRegistry.register('component-lookup:main', Ember.ComponentLookup);
 
-    registry = registry;
+    registry = new Ember.Registry({
+      fallback: fallbackRegistry
+    });
     container = registry.container();
     exposeRegistryMethodsWithoutDeprecations(container);
   } else {

lib/ember-test-helpers/test-module.js

@@ -234,7 +234,6 @@ export default Klass.extend({
     this.container = items.container;
     this.registry = items.registry;
 
-
     var thingToRegisterWith = this.registry || this.container;
     var router = resolver.resolve('router:main');
     router = router || Ember.Router.extend();
@@ -253,7 +252,11 @@ export default Klass.extend({
       thingToRegisterWith.register(fullName, resolver.resolve(normalizedFullName));
     }
 
-    thingToRegisterWith.resolver = function() { };
+    if (this.registry) {
+      this.registry.fallback.resolver = function() {};
+    } else {
+      this.container.resolver = function() {};
+    }
   },
 
   _setupIntegratedContainer: function() {

tests/test-module-test.js

@@ -11,7 +11,10 @@ function moduleFor(fullName, description, callbacks) {
 function setupRegistry() {
   setResolverRegistry({
     'component:x-foo':           Ember.Component.extend(),
-    'component:not-the-subject': Ember.Component.extend()
+    'component:not-the-subject': Ember.Component.extend(),
+    'foo:thing': Ember.Object.extend({
+      fromDefaultRegistry: true
+    })
   });
 }
 
@@ -176,3 +179,27 @@ test("throws an error when declaring integration: true and needs in the same mod
 
   ok(result, "should throw an Error when integration: true and needs are provided");
 });
+
+moduleFor('component:x-foo', 'should be able to override factories in integration mode', {
+  beforeSetup: function() {
+    setupRegistry();
+  },
+
+  integration: true
+});
+
+test('gets the default by default', function() {
+  var thing = this.container.lookup('foo:thing');
+
+  ok(thing.fromDefaultRegistry, 'found from the default registry');
+});
+
+test('can override the default', function() {
+  this.registry.register('foo:thing', Ember.Object.extend({
+    notTheDefault: true
+  }));
+  var thing = this.container.lookup('foo:thing');
+
+  ok(!thing.fromDefaultRegistry, 'should not be found from the default registry');
+  ok(thing.notTheDefault, 'found from the overridden factory');
+});