update.

Author: aladdin-add

lib/rules/test-case-property-ordering.js

@@ -57,18 +57,16 @@ module.exports = {
                     message,
                     data: { order: orderMsg.join(', ') },
                     fix (fixer) {
-                      // reorder the properties and put in result array.
                       const last = properties[properties.length - 1];
+                      // end loc to replace(including whitespaces).
+                      const finalEnd = sourceCode.getTokenAfter(last, token => token.value === '}' && token.type === 'Punctuator').range[0];
+                      // reorder the properties and put in result array.
                       const result = [];
                       for (let j = 0; j < keyNames.length; j++) {
                         const insertedIndex = orderMsg.indexOf(keyNames[j]);
                         const propertyCode = sourceCode.getText(properties[j]);
                         const propertyStart = properties[j].range[1];
-
-                        // last property didn't include trailing comma.
-                        const propertyEnd = j === properties.length - 1 ?
-                          sourceCode.getTokenAfter(last, token => token.value === '}' && token.type === 'Punctuator').range[0] :
-                          properties[j + 1].range[0];
+                        const propertyEnd = j < properties.length - 1 ? properties[j + 1].range[0] : finalEnd;
                         let trailing = sourceCode.getText().slice(propertyStart, propertyEnd);
 
                         // for last property, should check & add trailling commas.
@@ -79,12 +77,9 @@ module.exports = {
                       }
 
                       const start = properties[0].range[0];
-                      const end = sourceCode.getTokenAfter(last).value === ',' ?
-                        sourceCode.getTokenAfter(last, token => token.value === '}' && token.type === 'Punctuator').range[0] :
-                        last.range[1];
 
                       return fixer.replaceTextRange(
-                        [start, end],
+                        [start, finalEnd],
                         result.join('')
                       );
                     },

tests/lib/rules/test-case-property-ordering.js

@@ -119,19 +119,18 @@ ruleTester.run('test-case-property-ordering', rule, {
       code: `
         new RuleTester().run('foo', bar, {
           valid: [
-            { options: ["baz"], parserOptions: "", code: "foo", errors: ["foo"], output: "", },
+            {\ncode: "foo",\noutput: "",\nerrors: ["baz"],\nparserOptions: "",\n},
           ]
         });
       `,
       output: `
         new RuleTester().run('foo', bar, {
           valid: [
-            { code: "foo", errors: ["foo"], output: "", options: ["baz"], parserOptions: "", },
+            {\ncode: "foo",\noutput: "",\nparserOptions: "",\nerrors: ["baz"],\n},
           ]
         });
       `,
-      options: [['code', 'errors', 'output']],
-      errors: [{ message: 'The properties of a test case should be placed in a consistent order: [code, errors, output, options, parserOptions].' }],
+      errors: [{ message: 'The properties of a test case should be placed in a consistent order: [code, output, parserOptions, errors].' }],
     },
   ],
 });