[].concat() for invalid test, removed option

Author: ROSSROSALES

lib/rules/jsx-sort-props.js

@@ -58,6 +58,15 @@ function contextCompare(a, b, options) {
   let aProp = propName(a);
   let bProp = propName(b);
 
+  const aSortToEnd = shouldSortToEnd(a);
+  const bSortToEnd = shouldSortToEnd(b);
+  if (aSortToEnd && !bSortToEnd) {
+    return 1;
+  }
+  if (!aSortToEnd && bSortToEnd) {
+    return -1;
+  }
+
   if (options.reservedFirst) {
     const aIsReserved = isReservedPropName(aProp, options.reservedList);
     const bIsReserved = isReservedPropName(bProp, options.reservedList);
@@ -106,17 +115,6 @@ function contextCompare(a, b, options) {
     return 0;
   }
 
-  if (options.commentbetween) {
-    const aSortToEnd = shouldSortToEnd(a);
-    const bSortToEnd = shouldSortToEnd(b);
-    if (aSortToEnd && !bSortToEnd) {
-      return 1;
-    }
-    if (!aSortToEnd && bSortToEnd) {
-      return -1;
-    }
-  }
-
   const actualLocale = options.locale === 'auto' ? undefined : options.locale;
 
   if (options.ignoreCase) {
@@ -223,7 +221,6 @@ function generateFixerFunction(node, context, reservedList) {
   const noSortAlphabetically = configuration.noSortAlphabetically || false;
   const reservedFirst = configuration.reservedFirst || false;
   const locale = configuration.locale || 'auto';
-  const commentbetween = configuration.commentbetween || true;
 
   // Sort props according to the context. Only supports ignoreCase.
   // Since we cannot safely move JSXSpreadAttribute (due to potential variable overrides),
@@ -238,7 +235,6 @@ function generateFixerFunction(node, context, reservedList) {
     reservedFirst,
     reservedList,
     locale,
-    commentbetween,
   };
   const sortableAttributeGroups = getGroupsOfSortableAttributes(attributes, context);
   const sortedAttributeGroups = sortableAttributeGroups

tests/lib/rules/jsx-sort-props.js

@@ -298,7 +298,7 @@ ruleTester.run('jsx-sort-props', rule, {
       options: [{ locale: 'sk-SK' }],
     } : []
   )),
-  invalid: parsers.all([
+  invalid: parsers.all([].concat(
     {
       code: '<App b a />;',
       errors: [expectedError],
@@ -1048,5 +1048,5 @@ ruleTester.run('jsx-sort-props', rule, {
         },
       ],
     } : [],
-  ]),
+  )),
 });