fixing tests

Author: DianaSuvorova

docs/rules/connect-prefer-minimum-two-arguments.md

@@ -11,7 +11,7 @@ This rule enforces that Second argument is provided explicitly.
 The following pattern is considered incorrect:
 
 ```js
-connect(mapStateToProps, null, mergeProps)(Component)
+connect(mapStateToProps)(Component)
 ```
 
 The following patterns are considered correct:

index.js

@@ -6,18 +6,31 @@ const rules = {
   'prefer-separate-component-file': require('./lib/rules/prefer-separate-component-file'),
 };
 
+function configureAsError() {
+  const result = {};
+  Object.keys(rules).forEach((key) => {
+    result[`react-redux/${key}`] = 2;
+  });
+  return result;
+}
+
+const activeRulesConfig = configureAsError();
+
 module.exports = {
+  deprecatedRules: [],
   rules,
   configs: {
     recommended: {
-      'react-redux/connect-prefer-minimum-two-arguments': 0,
-      'react-redux/connect-prefer-named-arguments': 2,
-      'react-redux/mapStateToProps-prefer-parameters-names': 2,
-      'react-redux/mapDispatchToProps-prefer-parameters-names': 2,
-      'prefer-separate-component-file/mapDispatchToProps-prefer-parameters-names': 1,
+      rules: {
+        'react-redux/connect-prefer-minimum-two-arguments': 0,
+        'react-redux/connect-prefer-named-arguments': 2,
+        'react-redux/mapStateToProps-prefer-parameters-names': 2,
+        'react-redux/mapDispatchToProps-prefer-parameters-names': 2,
+        'react-redux/prefer-separate-component-file': 1,
+      },
     },
     all: {
-      rules,
+      rules: activeRulesConfig,
     },
   },
 };

lib/rules/connect-prefer-minimum-two-arguments.js

@@ -2,7 +2,7 @@ const isReactReduxConnect = require('../isReactReduxConnect');
 
 const report = function (context, node) {
   context.report({
-    message: 'Connect function should have 2 arguments',
+    message: 'Connect function should have at least 2 arguments.',
     node,
   });
 };

package.json

@@ -14,7 +14,7 @@
     "lint": "eslint ./",
     "test": "npm run lint && mocha tests --recursive",
     "test-single": "mocha tests/lib/rules/prefer-separate-component-file",
-    "debug-test": "mocha --debug-brk --inspect tests/lib/rules/prefer-separate-component-file"
+    "debug-test": "mocha --debug-brk --inspect tests/index.js"
   },
   "repository": {
   "type": "git",

tests/index.js

@@ -19,48 +19,24 @@ describe('all rule files should be exported by the plugin', () => {
   });
 });
 
-describe('deprecated rules', () => {
-  it('marks all deprecated rules as deprecated', () => {
-    ruleFiles.forEach((ruleName) => {
-      const inDeprecatedRules = Boolean(plugin.deprecatedRules[ruleName]);
-      const isDeprecated = plugin.rules[ruleName].meta.deprecated;
-      if (inDeprecatedRules) {
-        assert(isDeprecated, `${ruleName} metadata should mark it as deprecated`);
-      } else {
-        assert(!isDeprecated, `${ruleName} metadata should not mark it as deprecated`);
-      }
-    });
-  });
-});
-
 describe('configurations', () => {
   it('should export a \'recommended\' configuration', () => {
     assert(plugin.configs.recommended);
     Object.keys(plugin.configs.recommended.rules).forEach((configName) => {
-      assert.equal(configName.indexOf('react/'), 0);
-      const ruleName = configName.substring('react/'.length);
+      assert.equal(configName.indexOf('react-redux/'), 0);
+      const ruleName = configName.substring('react-redux/'.length);
       assert(plugin.rules[ruleName]);
     });
-
-    ruleFiles.forEach((ruleName) => {
-      const inRecommendedConfig = Boolean(plugin.configs.recommended.rules[`react/${ruleName}`]);
-      const isRecommended = plugin.rules[ruleName].meta.docs.recommended;
-      if (inRecommendedConfig) {
-        assert(isRecommended, `${ruleName} metadata should mark it as recommended`);
-      } else {
-        assert(!isRecommended, `${ruleName} metadata should not mark it as recommended`);
-      }
-    });
   });
   it('should export a \'all\' configuration', () => {
     assert(plugin.configs.all);
     Object.keys(plugin.configs.all.rules).forEach((configName) => {
-      assert.equal(configName.indexOf('react/'), 0);
+      assert.equal(configName.indexOf('react-redux/'), 0);
       assert.equal(plugin.configs.all.rules[configName], 2);
     });
     ruleFiles.forEach((ruleName) => {
       const inDeprecatedRules = Boolean(plugin.deprecatedRules[ruleName]);
-      const inAllConfig = Boolean(plugin.configs.all.rules[`react/${ruleName}`]);
+      const inAllConfig = Boolean(plugin.configs.all.rules[`react-redux/${ruleName}`]);
       assert(inDeprecatedRules || inAllConfig);
     });
   });

tests/lib/rules/connect-prefer-minimum-two-arguments.js

@@ -1,6 +1,6 @@
 require('babel-eslint');
 
-const rule = require('../../../lib/rules/prefer-explicit-mapDispatchToProps');
+const rule = require('../../../lib/rules/connect-prefer-minimum-two-arguments');
 const { RuleTester } = require('eslint');
 
 const parserOptions = {
@@ -13,25 +13,17 @@ const parserOptions = {
 
 const ruleTester = new RuleTester({ parserOptions });
 
-ruleTester.run('prefer-explicit-mapDispatchToProps', rule, {
+ruleTester.run('connect-prefer-minimum-two-arguments', rule, {
   valid: [
     'connect(mapStateToProps, mapDispatchToProps, mergeProps, options)(Component)',
     'connect(mapStateToProps, mapDispatchToProps)(Component)',
   ],
   invalid: [{
-    code: 'connect(mapStateToProps, null, mergeProps)(Component)',
+    code: 'connect(mapStateToProps)(Component)',
     errors: [
       {
-        message: 'Connect function should have explicit mapDispatchToProps argument',
+        message: 'Connect function should have at least 2 arguments.',
       },
     ],
-  }, {
-    code: 'connect(mapStateToProps, undefined)(Component)',
-    errors: [
-      {
-        message: 'Connect function should have explicit mapDispatchToProps argument',
-      },
-    ],
-  },
-  ],
+  }],
 });