subController’s parentController & target properties are now set to t…

…he concrete parentController.

packages_es6/ember-runtime/lib/controllers/array_controller.js

@@ -228,13 +228,15 @@ export default ArrayProxy.extend(ControllerMixin, SortableMixin, {
     if (!container.has(fullName)) {
       throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
     }
-    var parentController;
+
     if (this._isVirtual) {
       parentController = get(this, 'parentController');
+    } else {
+      parentController = this;
     }
-    parentController = parentController || this;
+
     subController = container.lookupFactory(fullName).create({
-      target: this,
+      target: parentController,
       parentController: parentController,
       model: object
     });

packages_es6/ember-runtime/tests/controllers/item_controller_class_test.js

@@ -265,6 +265,35 @@ test("if `lookupItemController` returns a string, it must be resolvable by the c
     "`lookupItemController` must return either null or a valid controller name");
 });
 
+test("target and parentController are set to the concrete parentController", function() {
+  var parent = ArrayController.create({
+
+  });
+
+  // typically controller created for {{each itemController="foo"}}
+  var virtual = ArrayController.create({
+    itemController: 'Item',
+    container: container,
+    target: parent,
+    parentController: parent,
+    _isVirtual: true,
+    model: Ember.A([
+      { name: 'kris seldenator' }
+    ])
+  });
+
+  var itemController = virtual.objectAtContent(0);
+
+  equal(itemController.get('parentController'), parent);
+  equal(itemController.get('target'), parent);
+
+  Ember.run(function() {
+    parent.destroy();
+    virtual.destroy();
+  });
+
+});
+
 test("array observers can invoke `objectAt` without overwriting existing item controllers", function() {
   createArrayController();