test: correctly reorder tests and check default allowThen: false for catch-or-return

Author: brettz9

__tests__/catch-or-return.js

@@ -53,16 +53,10 @@ ruleTester.run('catch-or-return', rule, {
       options: [{ allowThen: true }],
     },
 
-    // allowThen - .then(null, fn)
-    { code: 'frank().then(a, b)', options: [{ allowThen: true }] },
     {
       code: 'frank().then(a).then(b).then(null, c)',
       options: [{ allowThen: true }],
     },
-    {
-      code: 'frank().then(a).then(b).then(c, d)',
-      options: [{ allowThen: true }],
-    },
     {
       code: 'frank().then(a).then(b).then().then().then(null, doIt)',
       options: [{ allowThen: true }],
@@ -73,10 +67,15 @@ ruleTester.run('catch-or-return', rule, {
     },
 
     // allowThen - .then(fn, fn)
+    { code: 'frank().then(a, b)', options: [{ allowThen: true }] },
     {
       code: 'frank().then(go).then(zam, doIt)',
       options: [{ allowThen: true }],
     },
+    {
+      code: 'frank().then(a).then(b).then(c, d)',
+      options: [{ allowThen: true }],
+    },
     {
       code: 'frank().then(go).then().then().then().then(wham, doIt)',
       options: [{ allowThen: true }],
@@ -234,5 +233,45 @@ ruleTester.run('catch-or-return', rule, {
       code: 'frank().catch(go).someOtherMethod()',
       errors: [{ message: catchMessage }],
     },
+
+    // .then(null, fn)
+    {
+      code: 'frank().then(a).then(b).then(null, c)',
+      errors: [{ message: catchMessage }],
+    },
+    {
+      code: 'frank().then(a).then(b).then().then().then(null, doIt)',
+      errors: [{ message: catchMessage }],
+    },
+    {
+      code: 'frank().then(a).then(b).then(null, function() { /* why bother */ })',
+      errors: [{ message: catchMessage }],
+    },
+
+    // .then(fn, fn)
+    {
+      code: 'frank().then(a, b)',
+      errors: [{ message: catchMessage }],
+    },
+    {
+      code: 'frank().then(go).then(zam, doIt)',
+      errors: [{ message: catchMessage }],
+    },
+    {
+      code: 'frank().then(a).then(b).then(c, d)',
+      errors: [{ message: catchMessage }],
+    },
+    {
+      code: 'frank().then(go).then().then().then().then(wham, doIt)',
+      errors: [{ message: catchMessage }],
+    },
+    {
+      code: 'frank().then(go).then().then(function() {}, function() { /* why bother */ })',
+      errors: [{ message: catchMessage }],
+    },
+    {
+      code: 'frank.then(go).then(to).then(pewPew, jail)',
+      errors: [{ message: catchMessage }],
+    },
   ],
 })