Clean up variable utils and add more tests

jsx-eslint · Jan 2, 2017 · 9b88474 · 9b88474
1 parent 47405b4
commit 9b88474
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/lib/util/Components.js b/lib/util/Components.js
@@ -258,10 +258,9 @@ function componentRule(rule, context) {
       var destructuredReactCreateElement = function () {
         var variables = variableUtil.variablesInScope(context);
         var variable = variableUtil.getVariable(variables, 'createElement');
-        if (variable !== null) {
+        if (variable) {
           var map = variable.scope.set;
-          // eslint-disable-next-line no-undef
-          if (map instanceof Map && map.has('React')) {
+          if (map.has('React')) {
             return true;
           }
         }

diff --git a/lib/util/variable.js b/lib/util/variable.js
@@ -11,16 +11,9 @@
  * @returns {Boolean} True if the variable was found, false if not.
  */
 function findVariable(variables, name) {
-  var i;
-  var len;
-
-  for (i = 0, len = variables.length; i < len; i++) {
-    if (variables[i].name === name) {
-      return true;
-    }
-  }
-
-  return false;
+  return variables.some(function (variable) {
+    return variable.name === name;
+  });
 }
 
 /**
@@ -30,16 +23,9 @@ function findVariable(variables, name) {
  * @returns {Object} Variable if the variable was found, null if not.
  */
 function getVariable(variables, name) {
-  var i;
-  var len;
-
-  for (i = 0, len = variables.length; i < len; i++) {
-    if (variables[i].name === name) {
-      return variables[i];
-    }
-  }
-
-  return null;
+  return variables.find(function (variable) {
+    return variable.name === name;
+  });
 }
 
 /**

diff --git a/tests/lib/rules/display-name.js b/tests/lib/rules/display-name.js
@@ -572,5 +572,29 @@ ruleTester.run('display-name', rule, {
     errors: [{
       message: 'Component definition is missing display name'
     }]
+  }, {
+    code: [
+      'import React from "react";',
+      'const { createElement } = React;',
+      'export default (props) => {',
+      '  return createElement("div", {}, "hello");',
+      '};'
+    ].join('\n'),
+    parser: 'babel-eslint',
+    errors: [{
+      message: 'Component definition is missing display name'
+    }]
+  }, {
+    code: [
+      'import React from "react";',
+      'const createElement = React.createElement;',
+      'export default (props) => {',
+      '  return createElement("div", {}, "hello");',
+      '};'
+    ].join('\n'),
+    parser: 'babel-eslint',
+    errors: [{
+      message: 'Component definition is missing display name'
+    }]
   }]
 });