quotes: fixed duplicated test and use a proper error message

ember-template-lint · Dec 22, 2022 · dd13d2a · dd13d2a
1 parent 5496d3b
commit dd13d2a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/lib/rules/quotes.js b/lib/rules/quotes.js
@@ -69,7 +69,10 @@ export default class Quotes extends Rule {
     } else if (goodChars.hbs === chars.double && goodChars.html === chars.double) {
       message = 'you must use double quotes in templates';
     } else {
-      message = 'you must use double quotes x and single quotes in y in templates';
+      const double = goodChars.hbs === chars.double ? 'Handlebars syntax' : 'HTML attributes';
+      const single = goodChars.hbs === chars.single ? 'Handlebars syntax' : 'HTML attributes';
+
+      message = `you must use double quotes for ${double} and single quotes for ${single} in templates`;
     }
 
     return {

diff --git a/test/unit/rules/quotes-test.js b/test/unit/rules/quotes-test.js
@@ -291,7 +291,7 @@ generateRuleTests({
               "filePath": "layout.hbs",
               "isFixable": true,
               "line": 1,
-              "message": "you must use double quotes x and single quotes in y in templates",
+              "message": "you must use double quotes for Handlebars syntax and single quotes for HTML attributes in templates",
               "rule": "quotes",
               "severity": 2,
               "source": "type=\\"checkbox\\"",
@@ -303,7 +303,7 @@ generateRuleTests({
               "filePath": "layout.hbs",
               "isFixable": true,
               "line": 1,
-              "message": "you must use double quotes x and single quotes in y in templates",
+              "message": "you must use double quotes for Handlebars syntax and single quotes for HTML attributes in templates",
               "rule": "quotes",
               "severity": 2,
               "source": "{{hello 'test' x='test'}}",
@@ -315,7 +315,7 @@ generateRuleTests({
               "filePath": "layout.hbs",
               "isFixable": true,
               "line": 1,
-              "message": "you must use double quotes x and single quotes in y in templates",
+              "message": "you must use double quotes for Handlebars syntax and single quotes for HTML attributes in templates",
               "rule": "quotes",
               "severity": 2,
               "source": "x='test'",
@@ -325,9 +325,9 @@ generateRuleTests({
       },
     },
     {
-      config: { hbs: 'double', html: 'single' },
-      template: `<input type="checkbox"> {{hello 'test' x='test'}}`,
-      fixedTemplate: `<input type='checkbox'> {{hello "test" x="test"}}`,
+      config: { hbs: 'single', html: 'double' },
+      template: `<input type='checkbox'> {{hello "test" x="test"}}`,
+      fixedTemplate: `<input type="checkbox"> {{hello 'test' x='test'}}`,
 
       verifyResults(results) {
         expect(results).toMatchInlineSnapshot(`
@@ -339,10 +339,10 @@ generateRuleTests({
               "filePath": "layout.hbs",
               "isFixable": true,
               "line": 1,
-              "message": "you must use double quotes x and single quotes in y in templates",
+              "message": "you must use double quotes for HTML attributes and single quotes for Handlebars syntax in templates",
               "rule": "quotes",
               "severity": 2,
-              "source": "type=\\"checkbox\\"",
+              "source": "type='checkbox'",
             },
             {
               "column": 32,
@@ -351,10 +351,10 @@ generateRuleTests({
               "filePath": "layout.hbs",
               "isFixable": true,
               "line": 1,
-              "message": "you must use double quotes x and single quotes in y in templates",
+              "message": "you must use double quotes for HTML attributes and single quotes for Handlebars syntax in templates",
               "rule": "quotes",
               "severity": 2,
-              "source": "{{hello 'test' x='test'}}",
+              "source": "{{hello \\"test\\" x=\\"test\\"}}",
             },
             {
               "column": 41,
@@ -363,10 +363,10 @@ generateRuleTests({
               "filePath": "layout.hbs",
               "isFixable": true,
               "line": 1,
-              "message": "you must use double quotes x and single quotes in y in templates",
+              "message": "you must use double quotes for HTML attributes and single quotes for Handlebars syntax in templates",
               "rule": "quotes",
               "severity": 2,
-              "source": "x='test'",
+              "source": "x=\\"test\\"",
             },
           ]
         `);