From 0bf962d06290ad0bd75bd05ea255652ba2d6d396 Mon Sep 17 00:00:00 2001
From: Robert Jackson <robert.w.jackson@me.com>
Date: Sun, 24 May 2015 16:39:39 -0400
Subject: [PATCH] [BUGFIX beta] Ensure `parentView` includes yielding
 component.

---
 .../ember-htmlbars/lib/hooks/component.js     |  2 +-
 .../integration/component_invocation_test.js  | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/packages/ember-htmlbars/lib/hooks/component.js b/packages/ember-htmlbars/lib/hooks/component.js
index 88dbe920d47..edb210fb240 100644
--- a/packages/ember-htmlbars/lib/hooks/component.js
+++ b/packages/ember-htmlbars/lib/hooks/component.js
@@ -18,7 +18,7 @@ export default function componentHook(renderNode, env, scope, _tagName, params,
   }
 
   var read = env.hooks.getValue;
-  var parentView = read(env.view);
+  var parentView = read(scope.view);
 
   var manager = ComponentNodeManager.create(renderNode, env, {
     tagName,
diff --git a/packages/ember-htmlbars/tests/integration/component_invocation_test.js b/packages/ember-htmlbars/tests/integration/component_invocation_test.js
index 1a9865bddf8..a06d28b9237 100644
--- a/packages/ember-htmlbars/tests/integration/component_invocation_test.js
+++ b/packages/ember-htmlbars/tests/integration/component_invocation_test.js
@@ -575,6 +575,44 @@ QUnit.test("comopnent should rerender when a property is changed during children
 
 });
 
+QUnit.test("components in template of a yielding component should have the proper parentView", function() {
+  var outer, innerTemplate, innerLayout;
+
+  registry.register('component:x-outer', Component.extend({
+    init() {
+      this._super(...arguments);
+      outer = this;
+    }
+  }));
+
+  registry.register('component:x-inner-in-template', Component.extend({
+    init() {
+      this._super(...arguments);
+      innerTemplate = this;
+    }
+  }));
+
+  registry.register('component:x-inner-in-layout', Component.extend({
+    init() {
+      this._super(...arguments);
+      innerLayout = this;
+    }
+  }));
+
+  registry.register('template:components/x-outer', compile('{{x-inner-in-layout}}{{yield}}'));
+
+  view = EmberView.extend({
+    template: compile('{{#x-outer}}{{x-inner-in-template}}{{/x-outer}}'),
+    container: container
+  }).create();
+
+  runAppend(view);
+
+  equal(innerTemplate.parentView, outer, 'receives the wrapping component as its parentView in template blocks');
+  equal(innerLayout.parentView, outer, 'receives the wrapping component as its parentView in layout');
+  equal(outer.parentView, view, 'x-outer receives the ambient scope as its parentView');
+});
+
 QUnit.test("comopnent should rerender when a property (with a default) is changed during children's rendering", function() {
   expectDeprecation(/modified value twice in a single render/);