Fix named-functions-in-promises rule (#16)

Author: Michał Sajnóg

lib/rules/named-functions-in-promises.js

@@ -14,24 +14,28 @@ module.exports = function(context) {
     context.report(node, message);
   };
 
-  var promisesMethods = ['then', 'catch', 'finally'];
-
   return {
     CallExpression: function(node) {
-      var callee = node.callee;
+      var firstArg = node.arguments[0];
 
       if (
-        utils.isCallExpression(callee.object) &&
-        utils.isIdentifier(callee.property) &&
-        promisesMethods.indexOf(callee.property.name) > -1
+        hasPromiseExpression(node) &&
+        (
+          utils.isFunctionExpression(firstArg) ||
+          utils.isArrowFunctionExpression(firstArg)
+        )
       ) {
-        node.arguments.forEach(function(argument) {
-          if (!utils.isCallExpression(argument)) {
-            report(node);
-          }
-        });
+        report(node);
       }
     }
   };
 
+  function hasPromiseExpression(node) {
+    var callee = node.callee;
+    var promisesMethods = ['then', 'catch', 'finally'];
+
+    return utils.isCallExpression(callee.object) &&
+      utils.isIdentifier(callee.property) &&
+      promisesMethods.indexOf(callee.property.name) > -1;
+  }
 };

tests/lib/rules/named-functions-in-promises.js

@@ -23,6 +23,24 @@ eslintTester.run('named-functions-in-promises', rule, {
     }, {
       code: 'user.save().finally(this._finallyDo.bind(this));',
       parserOptions: {ecmaVersion: 6},
+    }, {
+      code: 'user.save().then(this._reloadUser);',
+      parserOptions: {ecmaVersion: 6},
+    }, {
+      code: 'user.save().catch(this._handleError);',
+      parserOptions: {ecmaVersion: 6},
+    }, {
+      code: 'user.save().finally(this._finallyDo);',
+      parserOptions: {ecmaVersion: 6},
+    }, {
+      code: 'user.save().then(_reloadUser);',
+      parserOptions: {ecmaVersion: 6},
+    }, {
+      code: 'user.save().catch(_handleError);',
+      parserOptions: {ecmaVersion: 6},
+    }, {
+      code: 'user.save().finally(_finallyDo);',
+      parserOptions: {ecmaVersion: 6},
     }
   ],
   invalid: [
@@ -32,6 +50,12 @@ eslintTester.run('named-functions-in-promises', rule, {
       errors: [{
         message: 'Use named functions defined on objects to handle promises',
       }],
+    }, {
+      code: 'user.save().then(() => user.reload());',
+      parserOptions: {ecmaVersion: 6},
+      errors: [{
+        message: 'Use named functions defined on objects to handle promises',
+      }],
     }, {
       code: 'user.save().catch(() => {return error.handle();});',
       parserOptions: {ecmaVersion: 6},