From 473aeef268207608693bd43344f1c6d2d87ce551 Mon Sep 17 00:00:00 2001
From: Eric Schank <eric.schank@gmail.com>
Date: Fri, 21 Aug 2015 00:22:14 -0500
Subject: [PATCH] [BUGFIX release-1-13] handle local layout for component
 #12134

---
 .../node-managers/component-node-manager.js    | 18 ++++++++++++------
 .../integration/component_invocation_test.js   | 11 +++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/ember-htmlbars/lib/node-managers/component-node-manager.js b/packages/ember-htmlbars/lib/node-managers/component-node-manager.js
index d9cc7202c93..8e5dac2f131 100644
--- a/packages/ember-htmlbars/lib/node-managers/component-node-manager.js
+++ b/packages/ember-htmlbars/lib/node-managers/component-node-manager.js
@@ -83,7 +83,7 @@ ComponentNodeManager.create = function(renderNode, env, options) {
   // If the component specifies its template via the `layout` or `template`
   // properties instead of using the template looked up in the container, get
   // them now that we have the component instance.
-  let result = extractComponentTemplates(component, templates);
+  let result = extractComponentTemplates(component, templates, layout);
   layout = result.layout || layout;
   templates = result.templates || templates;
 
@@ -149,7 +149,7 @@ function processPositionalParams(renderNode, positionalParams, params, attrs) {
   }
 }
 
-function extractComponentTemplates(component, _templates) {
+function extractComponentTemplates(component, _templates, _layout) {
   // Even though we looked up a layout from the container earlier, the
   // component may specify a `layout` property that overrides that.
   // The component may also provide a `template` property we should
@@ -169,11 +169,17 @@ function extractComponentTemplates(component, _templates) {
     layout = componentLayout;
     templates = extractLegacyTemplate(_templates, componentTemplate);
   } else if (componentTemplate) {
-    // If the component has a `template` but no `layout`, use the template
-    // as the layout.
-    layout = componentTemplate;
+    if (_layout) {
+      // If the component has no `layout`, but one was found during
+      // `lookupComponent` in calling `create` function, use that
+      layout = _layout;
+    } else {
+      // If the component has a `template` but no `layout`, use the template
+      // as the layout.
+      layout = componentTemplate;
+      Ember.deprecate("Using deprecated `template` property on a Component.");
+    }
     templates = _templates;
-    Ember.deprecate("Using deprecated `template` property on a Component.");
   }
 
   return { layout, templates };
diff --git a/packages/ember-htmlbars/tests/integration/component_invocation_test.js b/packages/ember-htmlbars/tests/integration/component_invocation_test.js
index d50e62a577e..2ba11b0b63c 100644
--- a/packages/ember-htmlbars/tests/integration/component_invocation_test.js
+++ b/packages/ember-htmlbars/tests/integration/component_invocation_test.js
@@ -1110,6 +1110,17 @@ QUnit.test('non-block with properties on attrs and component class', function()
   equal(jQuery('#qunit-fixture').text(), 'In layout - someProp: something here');
 });
 
+QUnit.test('no local layout component', function() {
+  registry.register('component:foo-bar', Component.extend({
+    defaultTemplate: { some: 'thing' }
+  }));
+  registry.register('template:components/foo-bar', compile('In layout - no local layout'));
+
+  view = appendViewFor('{{foo-bar}}');
+
+  equal(jQuery('#qunit-fixture').text(), 'In layout - no local layout');
+});
+
 QUnit.test('rerendering component with attrs from parent', function() {
   var willUpdate = 0;
   var didReceiveAttrs = 0;