[BUGFIX beta] Made sure inline if fails without two or three arguments

emberjs · Mar 8, 2018 · db83e0e · db83e0e
1 parent 5720135
commit db83e0e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/packages/ember-glimmer/tests/integration/helpers/if-unless-test.js b/packages/ember-glimmer/tests/integration/helpers/if-unless-test.js
@@ -10,13 +10,13 @@ moduleFor('Helpers test: inline {{if}}', class extends IfUnlessHelperTest {
   ['@test it raises when there are more than three arguments']() {
     expectAssertion(() => {
       this.render(`{{if condition 'a' 'b' 'c'}}`, { condition: true });
-    }, /The inline form of the `if` helper expects two or three arguments/);
+    }, `The inline form of the 'if' helper expects two or three arguments. ('-top-level' @ L1:C0) `);
   }
 
   ['@test it raises when there are less than two arguments']() {
     expectAssertion(() => {
       this.render(`{{if condition}}`, { condition: true });
-    }, /The inline form of the `if` helper expects two or three arguments/);
+    }, `The inline form of the 'if' helper expects two or three arguments. ('-top-level' @ L1:C0) `);
   }
 
 });

diff --git a/packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.js b/packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.js
@@ -10,31 +10,35 @@ export default function assertIfHelperWithoutArguments(env) {
     visitor: {
       BlockStatement(node) {
         if (isInvalidBlockIf(node)) {
-          assert(`#${assertMessage(node.path.original)} ${calculateLocationDisplay(moduleName, node.loc)}`);
+          assert(`${blockAssertMessage(node.path.original)} ${calculateLocationDisplay(moduleName, node.loc)}`);
         }
       },
 
       MustacheStatement(node) {
         if (isInvalidInlineIf(node)) {
-          assert(`#${assertMessage(node.path.original)} ${calculateLocationDisplay(moduleName, node.loc)}`);
+          assert(`${inlineAssertMessage(node.path.original)} ${calculateLocationDisplay(moduleName, node.loc)}`);
         }
       },
 
       SubExpression(node) {
         if (isInvalidInlineIf(node)) {
-          assert(`#${assertMessage(node.path.original)} ${calculateLocationDisplay(moduleName, node.loc)}`);
+          assert(`${inlineAssertMessage(node.path.original)} ${calculateLocationDisplay(moduleName, node.loc)}`);
         }
       }
     }
   };
 }
 
-function assertMessage(original) {
-  return `${original} requires a single argument.`;
+function blockAssertMessage(original) {
+  return `#${original} requires a single argument.`;
+}
+
+function inlineAssertMessage(original) {
+  return `The inline form of the '${original}' helper expects two or three arguments.`;
 }
 
 function isInvalidInlineIf(node) {
-  return node.path.original === 'if' && (!node.params || node.params.length < 1);
+  return node.path.original === 'if' && (!node.params || node.params.length < 2 || node.params.length > 3);
 }
 
 function isInvalidBlockIf(node) {

diff --git a/packages/ember-template-compiler/tests/plugins/assert-if-helper-without-arguments-test.js b/packages/ember-template-compiler/tests/plugins/assert-if-helper-without-arguments-test.js
@@ -27,7 +27,7 @@ moduleFor('ember-template-compiler: assert-if-helper-without-argument', class ex
       compile(`{{if}}`, {
         moduleName: 'baz/foo-bar'
       });
-    }, `#if requires a single argument. ('baz/foo-bar' @ L1:C0) `);
+    }, `The inline form of the 'if' helper expects two or three arguments. ('baz/foo-bar' @ L1:C0) `);
 
     compile(`{{if foo bar baz}}`, {
       moduleName: 'baz/foo-bar'
@@ -39,7 +39,7 @@ moduleFor('ember-template-compiler: assert-if-helper-without-argument', class ex
       compile(`{{input foo=(if)}}`, {
         moduleName: 'baz/foo-bar'
       });
-    }, `#if requires a single argument. ('baz/foo-bar' @ L1:C12) `);
+    }, `The inline form of the 'if' helper expects two or three arguments. ('baz/foo-bar' @ L1:C12) `);
 
     compile(`{{some-thing foo=(if foo bar baz)}}`, {
       moduleName: 'baz/foo-bar'