Fix deprecated-classes rule condition checks (#834)

* fix: short circuit condition if undefined * test: add expression and missing prop tests
department-of-veterans-affairs · Jun 16, 2022 · c186ca3 · c186ca3
1 parent 6ce96b2
commit c186ca3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/packages/eslint-plugin/lib/rules/deprecated-classes.js b/packages/eslint-plugin/lib/rules/deprecated-classes.js
@@ -1,5 +1,5 @@
 const getPropNode = (node, propName) =>
-  node.openingElement.attributes.find(n => n.name.name === propName);
+  node.openingElement.attributes.find(n => n.name?.name === propName);
 
 module.exports = {
   meta: {
@@ -18,7 +18,10 @@ module.exports = {
          * Deprecate green button
          */
         const className = getPropNode(node, 'className');
-        if (className?.value.value.includes('va-button-primary')) {
+        if (
+          className?.value?.value?.includes('va-button-primary') ||
+          className?.value?.expression?.value?.includes('va-button-primary')
+        ) {
           context.report({
             node,
             message:

diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@department-of-veterans-affairs/eslint-plugin",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "ESLint plugin for va.gov projects",
   "homepage": "https://github.com/department-of-veterans-affairs/veteran-facing-services-tools/tree/master/packages/eslint-plugin#readme",
   "bugs": {

diff --git a/packages/eslint-plugin/tests/lib/rules/deprecated-classes.js b/packages/eslint-plugin/tests/lib/rules/deprecated-classes.js
@@ -18,6 +18,9 @@ ruleTester.run('deprecated-classes', rule, {
     {
       code: `<button onClick={verify} type="button" className="usa-button-primary">Verify your identity</button>`,
     },
+    {
+      code: '<button>Edit</button>',
+    },
   ],
   invalid: [
     {
@@ -26,5 +29,11 @@ ruleTester.run('deprecated-classes', rule, {
         'The va-button-primary utility class is deprecated. Please visit https://design.va.gov/components/button/ for our guidance on buttons.',
       ],
     },
+    {
+      code: `<button onClick={verify} type="button" className={"usa-button-primary va-button-primary"}>Verify your identity</button>`,
+      errors: [
+        'The va-button-primary utility class is deprecated. Please visit https://design.va.gov/components/button/ for our guidance on buttons.',
+      ],
+    },
   ],
 });