refactor toErrorObject to optionsUtil

wix-incubator · Jan 24, 2016 · a958c6d · a958c6d
1 parent ee23d5b
commit a958c6d
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 19 deletions.
diff --git a/tests/lib/rules/no-single-chain.js b/tests/lib/rules/no-single-chain.js
@@ -12,7 +12,7 @@ var RuleTester = require('eslint').RuleTester;
 // ------------------------------------------------------------------------------
 
 var ruleTester = new RuleTester();
-var toErrorObject = require('../testUtil/toErrorObject').fromMessage('Do not use chain syntax for single method');
+var toErrorObject = require('../testUtil/optionsUtil').fromMessage('Do not use chain syntax for single method');
 
 ruleTester.run('no-single-chain', rule, {
     valid: [

diff --git a/tests/lib/rules/prefer-filter.js b/tests/lib/rules/prefer-filter.js
@@ -12,7 +12,7 @@ var RuleTester = require('eslint').RuleTester;
 // ------------------------------------------------------------------------------
 
 var ruleTester = new RuleTester();
-var toErrorObject = require('../testUtil/toErrorObject')
+var toErrorObject = require('../testUtil/optionsUtil')
     .fromMessage('Prefer _.filter or _.some over an if statement inside a _.forEach');
 
 ruleTester.run('prefer-filter', rule, {

diff --git a/tests/lib/rules/prefer-is-nil.js b/tests/lib/rules/prefer-is-nil.js
@@ -12,7 +12,7 @@ var RuleTester = require('eslint').RuleTester;
 // ------------------------------------------------------------------------------
 
 var ruleTester = new RuleTester();
-var toErrorObject = require('../testUtil/toErrorObject').fromMessage('Prefer isNil over checking for undefined or null.');
+var toErrorObject = require('../testUtil/optionsUtil').fromMessage('Prefer isNil over checking for undefined or null.');
 ruleTester.run('prefer-is-nil', rule, {
     valid: [
         'if (x === undefined) {}',

diff --git a/tests/lib/rules/prefer-lodash-chain.js b/tests/lib/rules/prefer-lodash-chain.js
@@ -12,7 +12,7 @@ var RuleTester = require('eslint').RuleTester;
 // ------------------------------------------------------------------------------
 
 var ruleTester = new RuleTester();
-var toErrorObject = require('../testUtil/toErrorObject').fromMessage('Prefer lodash chain');
+var toErrorObject = require('../testUtil/optionsUtil').fromMessage('Prefer lodash chain');
 ruleTester.run('prefer-lodash-chain', rule, {
     valid: [
         'var userNames = users.map(function(user) { return user.name; });',

diff --git a/tests/lib/rules/prefer-startswith.js b/tests/lib/rules/prefer-startswith.js
@@ -12,7 +12,7 @@ var RuleTester = require('eslint').RuleTester;
 // ------------------------------------------------------------------------------
 
 var ruleTester = new RuleTester();
-var toErrorObject = require('../testUtil/toErrorObject')
+var toErrorObject = require('../testUtil/optionsUtil')
     .fromMessage('Prefer _.startsWith instead of comparing indexOf() to 0');
 
 ruleTester.run('prefer-startswith', rule, {

diff --git a/tests/lib/rules/prefer-thru.js b/tests/lib/rules/prefer-thru.js
@@ -12,7 +12,7 @@ var RuleTester = require('eslint').RuleTester;
 // ------------------------------------------------------------------------------
 
 var ruleTester = new RuleTester();
-var toErrorObject = require('../testUtil/toErrorObject').fromMessage('Prefer using thru instead of function call in chain start.');
+var toErrorObject = require('../testUtil/optionsUtil').fromMessage('Prefer using thru instead of function call in chain start.');
 ruleTester.run('prefer-thru', rule, {
     valid: [
         'var x = _(str).thru(f).map(g).reduce(h);',

diff --git a/tests/lib/rules/preferred-alias.js b/tests/lib/rules/preferred-alias.js
@@ -13,7 +13,7 @@ var RuleTester = require('eslint').RuleTester;
 // ------------------------------------------------------------------------------
 
 var ruleTester = new RuleTester();
-var toErrorObject = require('../testUtil/toErrorObject').fromMessage("Method 'each' is an alias, for consistency prefer using 'forEach'");
+var toErrorObject = require('../testUtil/optionsUtil').fromMessage("Method 'each' is an alias, for consistency prefer using 'forEach'");
 ruleTester.run('preferred-alias', rule, {
     valid: [
         '_.forEach();',

diff --git a/tests/lib/rules/unwrap.js b/tests/lib/rules/unwrap.js
@@ -12,7 +12,7 @@ var RuleTester = require('eslint').RuleTester;
 // ------------------------------------------------------------------------------
 
 var ruleTester = new RuleTester();
-var toErrorObject = require('../testUtil/toErrorObject').fromMessage('Missing unwrapping at end of chain');
+var toErrorObject = require('../testUtil/optionsUtil').fromMessage('Missing unwrapping at end of chain');
 ruleTester.run('unwrap', rule, {
     valid: [
         'var x = _(a).map(f).reduce(g)',

diff --git a/tests/lib/testUtil/optionsUtil.js b/tests/lib/testUtil/optionsUtil.js
@@ -0,0 +1,18 @@
+'use strict';
+var _ = require('lodash');
+
+function fromMessage(message) {
+    return fromOptions({errors: [{message: message}]});
+}
+
+function fromOptions(options) {
+    return function (testCase) {
+        return _.isString(testCase) ? _.assign({code: testCase}, options) : _.assign(testCase, options);
+    };
+}
+
+module.exports = {
+    fromMessage: fromMessage,
+    fromVersion3: fromOptions({settings: {lodash: {version: 3}}}),
+    fromOptions: fromOptions
+};
diff --git a/tests/lib/testUtil/toErrorObject.js b/tests/lib/testUtil/toErrorObject.js