From e54c0a47bc03862d6eb1747c4907752643a562b9 Mon Sep 17 00:00:00 2001
From: Abhas <abhas@Abhass-MacBook-Pro.local>
Date: Mon, 24 Sep 2018 20:50:46 +0530
Subject: [PATCH] Fix tests and attr type check

---
 lib/rules/no-classname-with-stylename.js       |  8 +++++---
 tests/lib/rules/no-classname-with-stylename.js | 18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lib/rules/no-classname-with-stylename.js b/lib/rules/no-classname-with-stylename.js
index 188b99e..1c20fcf 100644
--- a/lib/rules/no-classname-with-stylename.js
+++ b/lib/rules/no-classname-with-stylename.js
@@ -38,14 +38,16 @@ module.exports = {
 
         return {
             "JSXOpeningElement": function (node) {
+                console.log(node.attributes);
+                
                 const hasClassNameWithoutExpr = node.attributes.some((attr) => (
-                    attr.type === "JSXIdentifier" && attr.name.name === "className" &&
+                    attr.name.type === "JSXIdentifier" && attr.name.name === "className" &&
                     (attr.value === null || attr.value.type !== 'JSXExpressionContainer')
                 ));
-                const hasStyleName = node.attributes.some((attr) => attr.type === "JSXIdentifier" && attr.name.name === "styleName");
+                const hasStyleName = node.attributes.some((attr) => attr.name.type === "JSXIdentifier" && attr.name.name === "styleName");
 
                 if (hasClassNameWithoutExpr && hasStyleName) {
-                    const nodeAttrClassName = node.attributes.find((attr) => attr.type === "JSXIdentifier" && attr.name.name === "className");
+                    const nodeAttrClassName = node.attributes.find((attr) => attr.name.type === "JSXIdentifier" && attr.name.name === "className");
                     context.report(nodeAttrClassName, reportText);
                 }
             }
diff --git a/tests/lib/rules/no-classname-with-stylename.js b/tests/lib/rules/no-classname-with-stylename.js
index 39a5e07..624fca0 100644
--- a/tests/lib/rules/no-classname-with-stylename.js
+++ b/tests/lib/rules/no-classname-with-stylename.js
@@ -21,7 +21,8 @@ var ruleTester = new RuleTester({
     parserOptions: {
         "ecmaFeatures": {
             "jsx": true
-        }
+        },
+        ecmaVersion: 7,
     }
 });
 ruleTester.run("no-classname-with-stylename", rule, {
@@ -30,6 +31,8 @@ ruleTester.run("no-classname-with-stylename", rule, {
         "<span styleName='my-card' />",
         "<span className='card' />",
         "<span className={123} styleName='my-card' />",
+        "<span {...({a:1})} className={'card'} styleName='my-card' />",
+        "<span {...someVar} className={'card'} styleName='my-card' />",
         "<span className={'card'} styleName='my-card' />",
         "<span className={true ? 'card' : 'no-card'} styleName='my-card' />"
         // give me some code that won't trigger a warning
@@ -53,6 +56,19 @@ ruleTester.run("no-classname-with-stylename", rule, {
             errors: [{
                 // message: "Disallow string className alongwith styleName in the same JSX tag",
             }]
+        },
+        {
+            code: "<span {...({qwe:234})} className='card' styleName='my-card' />",
+            errors: [{
+                // message: "Disallow string className alongwith styleName in the same JSX tag",
+            }]
+        },
+        {
+            code: "<span {...someVar} className='card' styleName='my-card' />",
+            errors: [{
+                // message: "Disallow string className alongwith styleName in the same JSX tag",
+            }]
         }
+
     ]
 });