- Remove regex literal argument; simplify

lo1tuma · Feb 17, 2020 · fdb3843 · fdb3843
1 parent 68a3c07
commit fdb3843
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 38 deletions.
diff --git a/lib/rules/valid-suite-description.js b/lib/rules/valid-suite-description.js
@@ -8,18 +8,26 @@
 const astUtils = require('../util/ast');
 const defaultSuiteNames = [ 'describe', 'context', 'suite' ];
 
-function inlineOptions(context) {
-    const pattern = new RegExp(context.options[0], 'u');
-    const suiteNames = context.options[1] ? context.options[1] : defaultSuiteNames;
-    const message = context.options[2];
+function inlineOptions(options) {
+    const [
+        stringPattern,
+        suiteNames = defaultSuiteNames,
+        message
+    ] = options;
+
+    const pattern = new RegExp(stringPattern, 'u');
 
     return { pattern, suiteNames, message };
 }
 
 function objectOptions(options) {
-    const pattern = new RegExp(options.pattern, 'u');
-    const suiteNames = options.suiteNames ? options.suiteNames : defaultSuiteNames;
-    const message = options.message;
+    const {
+        pattern: stringPattern,
+        suiteNames = defaultSuiteNames,
+        message
+    } = options;
+
+    const pattern = new RegExp(stringPattern, 'u');
 
     return { pattern, suiteNames, message };
 }
@@ -58,9 +66,9 @@ module.exports = {
     create(context) {
         const options = context.options[0];
 
-        const { pattern, suiteNames, message } = typeof options === 'object' && !(options instanceof RegExp) ?
+        const { pattern, suiteNames, message } = typeof options === 'object' ?
             objectOptions(options) :
-            inlineOptions(context);
+            inlineOptions(context.options);
 
         function isSuite(node) {
             return node.callee && node.callee.name && suiteNames.indexOf(node.callee.name) > -1;

diff --git a/lib/rules/valid-test-description.js b/lib/rules/valid-test-description.js
@@ -9,18 +9,25 @@ const astUtils = require('../util/ast');
 
 const defaultTestNames = [ 'it', 'test', 'specify' ];
 
-function inlineOptions(context) {
-    const pattern = context.options[0] ? new RegExp(context.options[0], 'u') : /^should/u;
-    const testNames = context.options[1] ? context.options[1] : defaultTestNames;
-    const message = context.options[2];
+function inlineOptions(options) {
+    const [
+        stringPattern = '^should',
+        testNames = defaultTestNames,
+        message
+    ] = options;
+
+    const pattern = new RegExp(stringPattern, 'u');
 
     return { pattern, testNames, message };
 }
 
 function objectOptions(options) {
-    const pattern = options.pattern ? new RegExp(options.pattern, 'u') : /^should/u;
-    const testNames = options.testNames ? options.testNames : defaultTestNames;
-    const message = options.message;
+    const {
+        pattern: stringPattern = '^should',
+        testNames = defaultTestNames,
+        message
+    } = options;
+    const pattern = new RegExp(stringPattern, 'u');
 
     return { pattern, testNames, message };
 }
@@ -59,9 +66,9 @@ module.exports = {
     create(context) {
         const options = context.options[0];
 
-        const { pattern, testNames, message } = typeof options === 'object' && !(options instanceof RegExp) ?
+        const { pattern, testNames, message } = typeof options === 'object' ?
             objectOptions(options) :
-            inlineOptions(context);
+            inlineOptions(context.options);
 
         function isTest(node) {
             return node.callee && node.callee.name && testNames.indexOf(node.callee.name) > -1;

diff --git a/test/rules/valid-suite-description.js b/test/rules/valid-suite-description.js
@@ -30,20 +30,10 @@ ruleTester.run('valid-suite-description', rules['valid-suite-description'], {
             options: [ '^[A-Z]', [ 'someFunction' ], 'some error message' ],
             code: 'someFunction("Should do something", function () { });'
         },
-        {
-            options: [ /^[A-Z]/, [ 'someFunction' ], 'some error message' ],
-            code: 'someFunction("Should do something", function () { });'
-        },
         {
             options: [ { pattern: '^[A-Z]', suiteNames: [ 'someFunction' ], message: 'some error message' } ],
             code: 'someFunction("Should do something", function () { });'
         },
-        /*
-        {
-            options: [ { pattern: /^[A-Z]/, suiteNames: [ 'someFunction' ], message: 'some error message' } ],
-            code: 'someFunction("Should do something", function () { });'
-        },
-        */
         {
             options: [ {} ],
             code: 'someFunction("Should do something", function () { });'

diff --git a/test/rules/valid-test-description.js b/test/rules/valid-test-description.js
@@ -35,20 +35,10 @@ ruleTester.run('valid-test-description', rules['valid-test-description'], {
             options: [ '^should', [ 'someFunction' ], 'some error message' ],
             code: 'someFunction("should do something", function () { });'
         },
-        {
-            options: [ /^should/, [ 'someFunction' ], 'some error message' ],
-            code: 'someFunction("should do something", function () { });'
-        },
         {
             options: [ { pattern: '^should', testNames: [ 'someFunction' ], message: 'some error message' } ],
             code: 'someFunction("should do something", function () { });'
         },
-        /*
-        {
-            options: [ { pattern: /^should/, testNames: [ 'someFunction' ], message: 'some error message' } ],
-            code: 'someFunction("should do something", function () { });'
-        },
-        */
         'someOtherFunction();',
         {
             parserOptions: { ecmaVersion: 2017 },