Ensure backwards compat for jsx-wrap-multilines

Each test either uses the new string options or the old boolean options
to be thorough.

Author: jomasti

lib/rules/jsx-wrap-multilines.js

@@ -35,18 +35,19 @@ module.exports = {
 
     schema: [{
       type: 'object',
+      // true/false are for backwards compatibility
       properties: {
         declaration: {
-          enum: ['ignore', 'parens', 'parens-new-line']
+          enum: [true, false, 'ignore', 'parens', 'parens-new-line']
         },
         assignment: {
-          enum: ['ignore', 'parens', 'parens-new-line']
+          enum: [true, false, 'ignore', 'parens', 'parens-new-line']
         },
         return: {
-          enum: ['ignore', 'parens', 'parens-new-line']
+          enum: [true, false, 'ignore', 'parens', 'parens-new-line']
         },
         arrow: {
-          enum: ['ignore', 'parens', 'parens-new-line']
+          enum: [true, false, 'ignore', 'parens', 'parens-new-line']
         }
       },
       additionalProperties: false
@@ -66,7 +67,7 @@ module.exports = {
 
     function isEnabled(type) {
       const option = getOption(type);
-      return option !== 'ignore';
+      return option && option !== 'ignore';
     }
 
     function isParenthesised(node) {
@@ -106,7 +107,7 @@ module.exports = {
 
       const option = getOption(type);
 
-      if (option === 'parens' && !isParenthesised(node) && isMultilines(node)) {
+      if ((option === true || option === 'parens') && !isParenthesised(node) && isMultilines(node)) {
         report(node, MISSING_PARENS, fixer => fixer.replaceText(node, `(${sourceCode.getText(node)})`));
       }
 

tests/lib/rules/jsx-wrap-multilines.js

@@ -215,47 +215,99 @@ ruleTester.run('jsx-wrap-multilines', rule, {
       code: RETURN_SINGLE_LINE
     }, {
       code: RETURN_PAREN
+    }, {
+      code: RETURN_SINGLE_LINE,
+      options: [{return: true}]
+    }, {
+      code: RETURN_PAREN,
+      options: [{return: true}]
     }, {
       code: RETURN_NO_PAREN,
       options: [{return: 'ignore'}]
+    }, {
+      code: RETURN_NO_PAREN,
+      options: [{return: false}]
     }, {
       code: DECLARATION_TERNARY_SINGLE_LINE
     }, {
       code: DECLARATION_TERNARY_PAREN
+    }, {
+      code: DECLARATION_TERNARY_SINGLE_LINE,
+      options: [{declaration: true}]
+    }, {
+      code: DECLARATION_TERNARY_PAREN,
+      options: [{declaration: true}]
     }, {
       code: DECLARATION_TERNARY_NO_PAREN,
       options: [{declaration: 'ignore'}]
+    }, {
+      code: DECLARATION_TERNARY_NO_PAREN,
+      options: [{declaration: false}]
     }, {
       code: ASSIGNMENT_TERNARY_SINGLE_LINE
     }, {
       code: ASSIGNMENT_TERNARY_PAREN
+    }, {
+      code: ASSIGNMENT_TERNARY_SINGLE_LINE,
+      options: [{assignment: true}]
+    }, {
+      code: ASSIGNMENT_TERNARY_PAREN,
+      options: [{assignment: true}]
     }, {
       code: ASSIGNMENT_TERNARY_NO_PAREN,
       options: [{assignment: 'ignore'}]
+    }, {
+      code: ASSIGNMENT_TERNARY_NO_PAREN,
+      options: [{assignment: false}]
     }, {
       code: DECLARATION_SINGLE_LINE
     }, {
       code: DECLARATION_PAREN
+    }, {
+      code: DECLARATION_SINGLE_LINE,
+      options: [{declaration: true}]
+    }, {
+      code: DECLARATION_PAREN,
+      options: [{declaration: true}]
     }, {
       code: DECLARATION_NO_PAREN,
       options: [{declaration: 'ignore'}]
+    }, {
+      code: DECLARATION_NO_PAREN,
+      options: [{declaration: false}]
     }, {
       code: ASSIGNMENT_SINGLE_LINE,
       options: [{declaration: 'ignore'}]
+    }, {
+      code: ASSIGNMENT_SINGLE_LINE,
+      options: [{declaration: false}]
     }, {
       code: ASSIGNMENT_PAREN
+    }, {
+      code: ASSIGNMENT_PAREN,
+      options: [{assignment: true}]
     }, {
       code: ASSIGNMENT_NO_PAREN,
       options: [{assignment: 'ignore'}]
+    }, {
+      code: ASSIGNMENT_NO_PAREN,
+      options: [{assignment: false}]
+    }, {
+      code: ARROW_PAREN
+    }, {
+      code: ARROW_SINGLE_LINE
     }, {
       code: ARROW_PAREN,
-      options: []
+      options: [{arrow: true}]
     }, {
       code: ARROW_SINGLE_LINE,
-      options: []
+      options: [{arrow: true}]
     }, {
       code: ARROW_NO_PAREN,
       options: [{arrow: 'ignore'}]
+    }, {
+      code: ARROW_NO_PAREN,
+      options: [{arrow: false}]
     }, {
       code: RETURN_PAREN_NEW_LINE,
       options: [{return: 'parens-new-line'}]
@@ -285,7 +337,7 @@ ruleTester.run('jsx-wrap-multilines', rule, {
     }, {
       code: RETURN_NO_PAREN,
       output: RETURN_PAREN,
-      options: [{return: 'parens'}],
+      options: [{return: true}],
       errors: [{message: MISSING_PARENS}]
     }, {
       code: DECLARATION_TERNARY_NO_PAREN,
@@ -294,21 +346,37 @@ ruleTester.run('jsx-wrap-multilines', rule, {
         {message: MISSING_PARENS},
         {message: MISSING_PARENS}
       ]
+    }, {
+      code: DECLARATION_TERNARY_NO_PAREN,
+      output: DECLARATION_TERNARY_PAREN,
+      options: [{declaration: true}],
+      errors: [
+        {message: MISSING_PARENS},
+        {message: MISSING_PARENS}
+      ]
     }, {
       code: ASSIGNMENT_TERNARY_NO_PAREN,
       output: ASSIGNMENT_TERNARY_PAREN,
       errors: [
         {message: MISSING_PARENS},
         {message: MISSING_PARENS}
       ]
+    }, {
+      code: ASSIGNMENT_TERNARY_NO_PAREN,
+      output: ASSIGNMENT_TERNARY_PAREN,
+      options: [{assignment: true}],
+      errors: [
+        {message: MISSING_PARENS},
+        {message: MISSING_PARENS}
+      ]
     }, {
       code: DECLARATION_NO_PAREN,
       output: DECLARATION_PAREN,
       errors: [{message: MISSING_PARENS}]
     }, {
       code: DECLARATION_NO_PAREN,
       output: DECLARATION_PAREN,
-      options: [{declaration: 'parens'}],
+      options: [{declaration: true}],
       errors: [{message: MISSING_PARENS}]
     }, {
       code: ASSIGNMENT_NO_PAREN,
@@ -317,15 +385,18 @@ ruleTester.run('jsx-wrap-multilines', rule, {
     }, {
       code: ASSIGNMENT_NO_PAREN,
       output: ASSIGNMENT_PAREN,
-      options: [{assignment: 'parens'}],
+      options: [{assignment: true}],
       errors: [{message: MISSING_PARENS}]
     }, {
       code: ARROW_NO_PAREN,
       output: ARROW_PAREN,
-      options: [{arrow: 'parens'}],
       errors: [{message: MISSING_PARENS}]
     }, {
-
+      code: ARROW_NO_PAREN,
+      output: ARROW_PAREN,
+      options: [{arrow: true}],
+      errors: [{message: MISSING_PARENS}]
+    }, {
       code: RETURN_NO_PAREN,
       output: addNewLineSymbols(RETURN_PAREN),
       options: [{return: 'parens-new-line'}],