Merge pull request #261 from lo1tuma/includes

Use includes instead of indexOf
lo1tuma · Jul 31, 2020 · a9c51b3 · a9c51b3
2 parents ddb7ef2 + d53a8cf
commit a9c51b3
Show file tree

Hide file tree

Showing 11 changed files with 277 additions and 14 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,6 +1,6 @@
 {
     "extends": "holidaycheck/es2015",
-    "plugins": [ "node" ],
+    "plugins": [ "node", "unicorn" ],
 
     "env": {
         "node": true
@@ -12,7 +12,8 @@
     },
 
     "rules": {
-        "node/no-unsupported-features": "error"
+        "node/no-unsupported-features": "error",
+        "unicorn/prefer-includes": "error"
     },
 
     "overrides": [

diff --git a/lib/rules/no-exclusive-tests.js b/lib/rules/no-exclusive-tests.js
@@ -27,7 +27,7 @@ module.exports = {
         function matchesMochaTestFunction(object) {
             const name = astUtils.getNodeName(object);
 
-            return mochaTestFunctions.indexOf(name) !== -1;
+            return mochaTestFunctions.includes(name);
         }
 
         function isPropertyNamedOnly(property) {

diff --git a/lib/rules/no-hooks-for-single-case.js b/lib/rules/no-hooks-for-single-case.js
@@ -53,7 +53,7 @@ module.exports = {
                 if (layer.testCount <= 1) {
                     layer.hookNodes
                         .filter(function (hookNode) {
-                            return allowedHooks.indexOf(hookNode.name) === -1;
+                            return !allowedHooks.includes(hookNode.name);
                         })
                         .forEach(function (hookNode) {
                             context.report({

diff --git a/lib/rules/no-identical-title.js b/lib/rules/no-identical-title.js
@@ -12,7 +12,7 @@ function newLayer() {
 
 function handlTestCaseTitles(context, titles, node, title) {
     if (astUtil.isTestCase(node)) {
-        if (titles.indexOf(title) !== -1) {
+        if (titles.includes(title)) {
             context.report({
                 node,
                 message: 'Test title is used multiple times in the same test suite.'
@@ -28,7 +28,7 @@ function handlTestSuiteTitles(context, titles, node, title) {
     if (!astUtil.isDescribe(node, additionalSuiteNames(settings))) {
         return;
     }
-    if (titles.indexOf(title) !== -1) {
+    if (titles.includes(title)) {
         context.report({
             node,
             message: 'Test suite title is used multiple times.'

diff --git a/lib/rules/no-setup-in-describe.js b/lib/rules/no-setup-in-describe.js
@@ -46,7 +46,7 @@ module.exports = {
 
         function isNestedInDescribeBlock() {
             return nesting.length &&
-                    nesting.indexOf(PURE) === -1 &&
+                    !nesting.includes(PURE) &&
                     nesting.lastIndexOf(FUNCTION) < nesting.lastIndexOf(DESCRIBE);
         }
 

diff --git a/lib/rules/no-skipped-tests.js b/lib/rules/no-skipped-tests.js
@@ -6,7 +6,7 @@ let mochaTestFunctions;
 let mochaXFunctions;
 
 function matchesMochaTestFunction(object) {
-    return object && mochaTestFunctions.indexOf(object.name) !== -1;
+    return object && mochaTestFunctions.includes(object.name);
 }
 
 function isPropertyNamedSkip(property) {
@@ -20,7 +20,7 @@ function isCallToMochasSkipFunction(callee) {
 }
 
 function isMochaXFunction(name) {
-    return mochaXFunctions.indexOf(name) !== -1;
+    return mochaXFunctions.includes(name);
 }
 
 function isCallToMochaXFunction(callee) {

diff --git a/lib/rules/valid-suite-description.js b/lib/rules/valid-suite-description.js
@@ -76,7 +76,7 @@ module.exports = {
             inlineOptions(context.options);
 
         function isSuite(node) {
-            return node.callee && node.callee.name && suiteNames.indexOf(node.callee.name) > -1;
+            return node.callee && node.callee.name && suiteNames.includes(node.callee.name);
         }
 
         function hasValidSuiteDescription(mochaCallExpression) {

diff --git a/lib/rules/valid-test-description.js b/lib/rules/valid-test-description.js
@@ -75,7 +75,7 @@ module.exports = {
             inlineOptions(context.options);
 
         function isTest(node) {
-            return node.callee && node.callee.name && testNames.indexOf(node.callee.name) > -1;
+            return node.callee && node.callee.name && testNames.includes(node.callee.name);
         }
 
         function hasValidTestDescription(mochaCallExpression) {

diff --git a/lib/util/ast.js b/lib/util/ast.js
@@ -31,13 +31,13 @@ function getNodeName(node) {
 function isDescribe(node, additionalSuiteNames = []) {
     const describeAliases = getSuiteNames({ modifiers: [ 'skip', 'only' ], additionalSuiteNames });
 
-    return isCallExpression(node) && describeAliases.indexOf(getNodeName(node.callee)) > -1;
+    return isCallExpression(node) && describeAliases.includes(getNodeName(node.callee));
 }
 
 function isHookIdentifier(node) {
     return node &&
       node.type === 'Identifier' &&
-      hooks.indexOf(node.name) !== -1;
+      hooks.includes(node.name);
 }
 
 function isHookCall(node) {
@@ -48,7 +48,7 @@ function isTestCase(node, options = {}) {
     const { modifiers = [ 'skip', 'only' ] } = options;
 
     const testCaseNames = getTestCaseNames({ modifiers });
-    return isCallExpression(node) && testCaseNames.indexOf(getNodeName(node.callee)) > -1;
+    return isCallExpression(node) && testCaseNames.includes(getNodeName(node.callee));
 }
 
 function isSuiteConfigExpression(node) {