Merge pull request #12996 from spencer516/with-array

[bugfix BETA] Fixes 12995 #with array yields true
emberjs · Feb 23, 2016 · d1d50d1 · d1d50d1
2 parents b8eda40 + 626339c
commit d1d50d1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/packages/ember-glimmer/tests/integration/syntax/with-test.js b/packages/ember-glimmer/tests/integration/syntax/with-test.js
@@ -122,6 +122,29 @@ moduleFor('Syntax test: {{#with as}}', class extends SharedConditionalsTest{
     this.assertText('No Thing bar');
   }
 
+  ['@test can access alias of an array']() {
+    this.render(`{{#with arrayThing as |thing|}}{{#each thing as |value|}}{{value}}{{/each}}{{/with}}`, {
+      arrayThing: ['a', 'b', 'c', 'd']
+    });
+
+    this.assertText('abcd');
+
+    this.runTask(() => this.rerender());
+
+    this.assertText('abcd');
+  }
+
+  ['@test empty arrays yield inverse']() {
+    this.render(`{{#with arrayThing as |thing|}}{{thing}}{{else}}Empty Array{{/with}}`, {
+      arrayThing: []
+    });
+
+    this.assertText('Empty Array');
+
+    this.runTask(() => this.rerender());
+
+    this.assertText('Empty Array');
+  }
 }, BASIC_TRUTHY_TESTS, BASIC_FALSY_TESTS);
 
 moduleFor('Syntax test: Multiple {{#with as}} helpers', class extends RenderingTest {

diff --git a/packages/ember-htmlbars/lib/hooks/link-render-node.js b/packages/ember-htmlbars/lib/hooks/link-render-node.js
@@ -87,7 +87,7 @@ function shouldDisplay(predicate, coercer) {
     let isTruthyVal = read(isTruthy);
 
     if (isArray(predicateVal)) {
-      return lengthVal > 0;
+      return lengthVal > 0 ? predicateVal : false;
     }
 
     if (typeof isTruthyVal === 'boolean') {