From 64a685359d5680095e88e487fcd29b86c434c6f8 Mon Sep 17 00:00:00 2001
From: Robert Jackson <robert.w.jackson@me.com>
Date: Sun, 21 Aug 2016 13:39:11 -0400
Subject: [PATCH] [BUGFIX beta] Avoid assertion when `id=` is provided to
 tagless components.

---
 .../lib/syntax/curly-component.js             |  2 +-
 .../components/fragment-components-test.js    | 35 +++++++++++++++++++
 .../lib/system/build-component-template.js    |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/packages/ember-glimmer/lib/syntax/curly-component.js b/packages/ember-glimmer/lib/syntax/curly-component.js
index de7b7a3d5c0..6232f93cc34 100644
--- a/packages/ember-glimmer/lib/syntax/curly-component.js
+++ b/packages/ember-glimmer/lib/syntax/curly-component.js
@@ -186,7 +186,7 @@ class CurlyComponentManager {
 
     assert('You cannot use `elementId` on a tag-less component: ' + component.toString(), (() => {
       let { elementId, tagName } = component;
-      return tagName !== '' || (!elementId && elementId !== '');
+      return tagName !== '' || props.id === elementId || (!elementId && elementId !== '');
     })());
 
     assert('You cannot use `attributeBindings` on a tag-less component: ' + component.toString(), (() => {
diff --git a/packages/ember-glimmer/tests/integration/components/fragment-components-test.js b/packages/ember-glimmer/tests/integration/components/fragment-components-test.js
index 20f4348aa2b..0a1b71a294e 100644
--- a/packages/ember-glimmer/tests/integration/components/fragment-components-test.js
+++ b/packages/ember-glimmer/tests/integration/components/fragment-components-test.js
@@ -130,6 +130,41 @@ moduleFor('Components test: fragment components', class extends RenderingTest {
     }, /You cannot use `elementId` on a tag-less component/);
   }
 
+  ['@test throws an error if `tagName` is an empty string and `elementId` is specified via template']() {
+    let template = `hit dem folks`;
+    let FooBarComponent = Component.extend({
+      tagName: ''
+    });
+
+    this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template });
+    expectAssertion(() => {
+      this.render(`{{#foo-bar elementId='turntUp'}}{{/foo-bar}}`);
+    }, /You cannot use `elementId` on a tag-less component/);
+  }
+
+  ['@test does not throw an error if `tagName` is an empty string and `id` is specified via JS']() {
+    let template = `{{id}}`;
+    let FooBarComponent = Component.extend({
+      tagName: '',
+      id: 'baz'
+    });
+
+    this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template });
+    this.render(`{{#foo-bar}}{{/foo-bar}}`);
+    this.assertText('baz');
+  }
+
+  ['@test does not throw an error if `tagName` is an empty string and `id` is specified via template']() {
+    let template = `{{id}}`;
+    let FooBarComponent = Component.extend({
+      tagName: ''
+    });
+
+    this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template });
+    this.render(`{{#foo-bar id='baz'}}{{/foo-bar}}`);
+    this.assertText('baz');
+  }
+
   ['@test throws an error if when $() is accessed on component where `tagName` is an empty string']() {
     let template = `hit dem folks`;
     let FooBarComponent = Component.extend({
diff --git a/packages/ember-htmlbars/lib/system/build-component-template.js b/packages/ember-htmlbars/lib/system/build-component-template.js
index d696634686c..b6b5b2cc09d 100644
--- a/packages/ember-htmlbars/lib/system/build-component-template.js
+++ b/packages/ember-htmlbars/lib/system/build-component-template.js
@@ -41,7 +41,7 @@ export default function buildComponentTemplate({ component, tagName, layout, out
 
     assert('You cannot use `elementId` on a tag-less component: ' + component.toString(), (() => {
       let { elementId } = component;
-      return tagName !== '' || (!elementId && elementId !== '');
+      return tagName !== '' || attrs.id === elementId || (!elementId && elementId !== '');
     })());
 
     assert('You cannot use `attributeBindings` on a tag-less component: ' + component.toString(), (() => {