Update: allow object methods in callback-return (fixes eslint#4711)

fakewaffle · Dec 15, 2015 · 6b6e524 · 6b6e524
1 parent db2f41c
commit 6b6e524
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/docs/rules/callback-return.md b/docs/rules/callback-return.md
@@ -54,7 +54,7 @@ function foo() {
 The rule takes a single option, which is an array of possible callback names.
 
 ```json
-callback-return: [2, ["callback", "cb", "next"]]
+callback-return: [2, ["callback", "cb", "next", "send.sucess"]]
 ```
 
 ### Gotchas

diff --git a/lib/rules/callback-return.js b/lib/rules/callback-return.js
@@ -39,7 +39,15 @@ module.exports = function(context) {
      * @returns {Boolean} Whether or not this function matches our callback name.
      */
     function isCallback(node) {
-        return node.callee.type === "Identifier" && callbacks.indexOf(node.callee.name) > -1;
+        if (node.callee.type === "Identifier" && callbacks.indexOf(node.callee.name) > -1) {
+            return true;
+        }
+
+        if (node.callee.type === "MemberExpression" && callbacks.indexOf(node.callee.object.name + "." + node.callee.property.name) > -1) {
+            return true;
+        }
+
+        return false;
     }
 
     /**

diff --git a/tests/lib/rules/callback-return.js b/tests/lib/rules/callback-return.js
@@ -39,6 +39,7 @@ ruleTester.run("callback-return", rule, {
         "function x() { switch(x) { case 'a': return next(); } }",
         "function x() { for(x = 0; x < 10; x++) { return next(); } }",
         "function x() { while(x) { return next(); } }",
+        "function a(err) { if (err) { send.error (err); } }",
 
         // callback() all you want outside of a function
         "callback()",
@@ -234,6 +235,27 @@ ruleTester.run("callback-return", rule, {
             }]
         },
 
+        // object methods
+        {
+            code: "function a(err) { if (err) { send.error (err); } }",
+            options: [["send.error"]],
+            errors: [{
+                message: "Expected return with your callback function.",
+                line: 1,
+                column: 30,
+                nodeType: "CallExpression"
+            }]
+        },
+        {
+            code: "function a(err) { if (err) { send.error (err); } send.success(); }",
+            options: [["send.error", "send.success"]],
+            errors: [{
+                message: "Expected return with your callback function.",
+                line: 1,
+                column: 30,
+                nodeType: "CallExpression"
+            }]
+        },
 
         // generally good behavior which we must not allow to keep the rule simple
         {