Sync with template-lint

Author: NullVoxPopuli

docs/rules/template-no-unnecessary-concat.md

@@ -15,9 +15,7 @@ This rule **forbids** the following:
 ```gjs
 <template>
   <span class="{{if errors.length 'text-danger' 'text-grey'}}">
-
   <img src="{{customSrc}}" alt="{{customAlt}}">
-
   <label for="{{concat elementId "-date"}}">
 </template>
 ```
@@ -27,9 +25,7 @@ This rule **allows** the following:
 ```gjs
 <template>
   <span class={{if errors.length 'text-danger' 'text-grey'}}>
-
   <img src={{customSrc}} alt={{customAlt}}>
-
   <label for={{concat elementId "-date"}}>
 </template>
 ```

tests/lib/rules/template-no-unnecessary-concat.js

@@ -1,35 +1,54 @@
 const rule = require('../../../lib/rules/template-no-unnecessary-concat');
 const RuleTester = require('eslint').RuleTester;
 
-const ruleTester = new RuleTester({
+const validHbs = [
+  '<div class={{clazz}}></div>',
+  '<div class="first {{second}}"></div>',
+  '"{{foo}}"',
+];
+
+const invalidHbs = [
+  {
+    code: '<div class="{{clazz}}"></div>',
+    output: '<div class={{clazz}}></div>',
+    errors: [
+      { message: 'Unnecessary string concatenation. Use {{clazz}} instead of "{{clazz}}".' },
+    ],
+  },
+  {
+    code: '<img src="{{url}}" alt="{{t "alternate-text"}}">',
+    output: '<img src={{url}} alt={{t "alternate-text"}}>',
+    errors: [
+      { message: 'Unnecessary string concatenation. Use {{url}} instead of "{{url}}".' },
+      {
+        message:
+          'Unnecessary string concatenation. Use {{t "alternate-text"}} instead of "{{t "alternate-text"}}".',
+      },
+    ],
+  },
+];
+
+function wrapTemplate(entry) {
+  if (typeof entry === 'string') {
+    return `<template>${entry}</template>`;
+  }
+
+  return {
+    ...entry,
+    code: `<template>${entry.code}</template>`,
+    output: entry.output ? `<template>${entry.output}</template>` : entry.output,
+    errors: entry.errors.map(() => ({ messageId: 'unnecessary' })),
+  };
+}
+
+const gjsRuleTester = new RuleTester({
   parser: require.resolve('ember-eslint-parser'),
   parserOptions: { ecmaVersion: 2022, sourceType: 'module' },
 });
-ruleTester.run('template-no-unnecessary-concat', rule, {
-  valid: [
-    '<template><div class="foo {{bar}}"></div></template>',
-    '<template><div class={{clazz}}></div></template>',
-    '<template><div class="first {{second}}"></div></template>',
-    '<template>"{{foo}}"</template>',
-  ],
-  invalid: [
-    {
-      code: '<template><div class="{{foo}}"></div></template>',
-      output: '<template><div class={{foo}}></div></template>',
-      errors: [{ messageId: 'unnecessary' }],
-    },
 
-    {
-      code: '<template><div class="{{clazz}}"></div></template>',
-      output: '<template><div class={{clazz}}></div></template>',
-      errors: [{ messageId: 'unnecessary' }],
-    },
-    {
-      code: '<template><img src="{{url}}" alt="{{t "alternate-text"}}"></template>',
-      output: '<template><img src={{url}} alt={{t "alternate-text"}}></template>',
-      errors: [{ messageId: 'unnecessary' }, { messageId: 'unnecessary' }],
-    },
-  ],
+gjsRuleTester.run('template-no-unnecessary-concat', rule, {
+  valid: validHbs.map(wrapTemplate),
+  invalid: invalidHbs.map(wrapTemplate),
 });
 
 const hbsRuleTester = new RuleTester({
@@ -41,25 +60,6 @@ const hbsRuleTester = new RuleTester({
 });
 
 hbsRuleTester.run('template-no-unnecessary-concat', rule, {
-  valid: ['<div class={{clazz}}></div>', '<div class="first {{second}}"></div>', '"{{foo}}"'],
-  invalid: [
-    {
-      code: '<div class="{{clazz}}"></div>',
-      output: '<div class={{clazz}}></div>',
-      errors: [
-        { message: 'Unnecessary string concatenation. Use {{clazz}} instead of "{{clazz}}".' },
-      ],
-    },
-    {
-      code: '<img src="{{url}}" alt="{{t "alternate-text"}}">',
-      output: '<img src={{url}} alt={{t "alternate-text"}}>',
-      errors: [
-        { message: 'Unnecessary string concatenation. Use {{url}} instead of "{{url}}".' },
-        {
-          message:
-            'Unnecessary string concatenation. Use {{t "alternate-text"}} instead of "{{t "alternate-text"}}".',
-        },
-      ],
-    },
-  ],
+  valid: validHbs,
+  invalid: invalidHbs,
 });