Merge pull request #19657 from mixonic/mixonic/remove-hasBlock-hasBlo…

…ckParams Remove hasBlock and hasBlockParams
emberjs · Jul 21, 2021 · 561d569 · 561d569
2 parents cc45f94 + 5561896
commit 561d569
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 315 deletions.
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
@@ -150,7 +150,7 @@
  */
 
 /**
-  `{{has-block}}` indicates if the component was invoked with a block.
+  `{{(has-block)}}` indicates if the component was invoked with a block.
 
   This component is invoked with a block:
 
@@ -187,15 +187,15 @@
   {{/if}}
   ```
 
-  @method hasBlock
+  @method has-block
   @for Ember.Templates.helpers
   @param {String} the name of the block. The name (at the moment) is either "main" or "inverse" (though only curly components support inverse)
   @return {Boolean} `true` if the component was invoked with a block
   @public
  */
 
 /**
-  `{{has-block-params}}` indicates if the component was invoked with block params.
+  `{{(has-block-params)}}` indicates if the component was invoked with block params.
 
   This component is invoked with block params:
 
@@ -242,7 +242,7 @@
   {{/if}}
   ```
 
-  @method hasBlockParams
+  @method has-block-params
   @for Ember.Templates.helpers
   @param {String} the name of the block. The name (at the moment) is either "main" or "inverse" (though only curly components support inverse)
   @return {Boolean} `true` if the component was invoked with block params

diff --git a/...ages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/...ages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -1357,13 +1357,10 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test GH#18732 hasBlock works within a yielded curried component invoked within mustaches']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/component-with-has-block.hbs' @ L1:C5) `
-      );
+    ['@test GH#18732 (has-block) works within a yielded curried component invoked within mustaches']() {
       this.registerComponent('component-with-has-block', {
         ComponentClass: Component.extend(),
-        template: '<div>{{hasBlock}}</div>',
+        template: '<div>{{(has-block)}}</div>',
       });
 
       this.registerComponent('yielding-component', {
@@ -1382,14 +1379,10 @@ moduleFor(
       this.assertText('false');
     }
 
-    ['@test GH#18732 has-block works within a yielded curried component invoked with angle bracket invocation (falsy)']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/component-with-has-block.hbs' @ L1:C5) `
-      );
-
+    ['@test GH#18732 (has-block) works within a yielded curried component invoked with angle bracket invocation (falsy)']() {
       this.registerComponent('component-with-has-block', {
         ComponentClass: Component.extend(),
-        template: '<div>{{hasBlock}}</div>',
+        template: '<div>{{(has-block)}}</div>',
       });
 
       this.registerComponent('yielding-component', {
@@ -1408,14 +1401,10 @@ moduleFor(
       this.assertText('false');
     }
 
-    ['@test GH#18732 has-block works within a yielded curried component invoked with angle bracket invocation (truthy)']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/component-with-has-block.hbs' @ L1:C5) `
-      );
-
+    ['@test GH#18732 (has-block) works within a yielded curried component invoked with angle bracket invocation (truthy)']() {
       this.registerComponent('component-with-has-block', {
         ComponentClass: Component.extend(),
-        template: '<div>{{hasBlock}}</div>',
+        template: '<div>{{(has-block)}}</div>',
       });
 
       this.registerComponent('yielding-component', {