rebase with upstream, fix error

Author: dannysindra

Diff for: docs/rules/order.md

@@ -1,7 +1,7 @@
 # import/order: Enforce a convention in module import order
 
 Enforce a convention in the order of `require()` / `import` statements.
-+(fixable) The `--fix` option on the [command line] automatically fixes problems reported by this rule. When the `alphabetize` option is used, multiple fix passes may be required.
++(fixable) The `--fix` option on the [command line] automatically fixes problems reported by this rule.
 The order is as shown in the following example:
 
 ```js

Diff for: tests/src/rules/order.js

@@ -1390,6 +1390,10 @@ ruleTester.run('order', rule, {
         groups: ['external', 'index'],
         alphabetize: {order: 'asc', ignoreCase: true}
       }],
+      errors: [{
+        ruleID: 'order',
+        message: '`bar` import should occur before import of `Baz`',
+      }]
     }),
     // Option alphabetize: {order: 'desc', ignoreCase: false}
     test({