fix: incorrectly-used messageId placeholders

qunitjs · Jul 5, 2022 · 546345f · 546345f
1 parent f3878c1
commit 546345f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/lib/rules/no-hooks-from-ancestor-modules.js b/lib/rules/no-hooks-from-ancestor-modules.js
@@ -28,7 +28,7 @@ module.exports = {
         },
         fixable: null,
         messages: {
-            "noHooksFromAncestorModules": "Do not call {{usedHooksIdentifierName}}.{{hookName}} from an ancestor module."
+            "noHooksFromAncestorModules": "Do not call {{usedHooksIdentifierName}}.{{invokedMethodName}} from an ancestor module."
         },
         schema: []
     },

diff --git a/lib/rules/no-only.js b/lib/rules/no-only.js
@@ -35,10 +35,7 @@ module.exports = {
                 if (utils.isOnly(node.callee)) {
                     context.report({
                         node: node,
-                        messageId: "noQUnitOnly",
-                        data: {
-                            callee: node.callee.name
-                        }
+                        messageId: "noQUnitOnly"
                     });
                 }
             }

diff --git a/lib/rules/no-skip.js b/lib/rules/no-skip.js
@@ -36,10 +36,7 @@ module.exports = {
                 if (utils.isSkip(node.callee)) {
                     context.report({
                         node: node,
-                        messageId: "noQUnitSkip",
-                        data: {
-                            callee: node.callee.name
-                        }
+                        messageId: "noQUnitSkip"
                     });
                 }
             }

diff --git a/tests/lib/rules/no-skip.js b/tests/lib/rules/no-skip.js
@@ -15,15 +15,6 @@ const rule = require("../../../lib/rules/no-skip"),
 // Tests
 //------------------------------------------------------------------------------
 
-function createError(callee) {
-    return {
-        messageId: "noQUnitSkip",
-        data: {
-            callee
-        }
-    };
-}
-
 const ruleTester = new RuleTester();
 
 ruleTester.run("no-skip", rule, {
@@ -37,23 +28,23 @@ ruleTester.run("no-skip", rule, {
     invalid: [
         {
             code: "QUnit.module.skip('Name', function() { });",
-            errors: [createError("QUnit.module.skip")]
+            errors: [{ messageId: "noQUnitSkip" }]
         },
         {
             code: "QUnit.skip('Name', function() { });",
-            errors: [createError("QUnit.skip")]
+            errors: [{ messageId: "noQUnitSkip" }]
         },
         {
             code: "module.skip('Name', function() { });",
-            errors: [createError("module.skip")]
+            errors: [{ messageId: "noQUnitSkip" }]
         },
         {
             code: "skip('Name', function() { });",
-            errors: [createError("skip")]
+            errors: [{ messageId: "noQUnitSkip" }]
         },
         {
             code: "test.skip('Name', function() { });",
-            errors: [createError("test.skip")]
+            errors: [{ messageId: "noQUnitSkip" }]
         }
     ]
 });