Merge pull request #114 from lo1tuma/additional-test-functions-member…

…-expression Support MemberExpression for additionalTestFunctions
lo1tuma · Dec 14, 2016 · 9ce0d5d · 9ce0d5d
2 parents 0ab2f58 + 1cf41e4
commit 9ce0d5d
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 7 deletions.
diff --git a/lib/rules/no-exclusive-tests.js b/lib/rules/no-exclusive-tests.js
@@ -1,6 +1,7 @@
 'use strict';
 
-var getAdditionalTestFunctions = require('../util/settings').getAdditionalTestFunctions;
+var getAdditionalTestFunctions = require('../util/settings').getAdditionalTestFunctions,
+    astUtils = require('../util/ast');
 
 module.exports = function (context) {
     var mochaTestFunctions = [
@@ -17,11 +18,13 @@ module.exports = function (context) {
     mochaTestFunctions = mochaTestFunctions.concat(additionalTestFunctions);
 
     function matchesMochaTestFunction(object) {
-        return object && mochaTestFunctions.indexOf(object.name) !== -1;
+        var name = astUtils.getNodeName(object);
+
+        return mochaTestFunctions.indexOf(name) !== -1;
     }
 
     function isPropertyNamedOnly(property) {
-        return property && (property.name === 'only' || property.value === 'only');
+        return property && astUtils.getPropertyName(property) === 'only';
     }
 
     function isCallToMochasOnlyFunction(callee) {

diff --git a/lib/util/ast.js b/lib/util/ast.js
@@ -10,9 +10,13 @@ var describeAliases = [ 'describe', 'xdescribe', 'describe.only', 'describe.skip
                       'test', 'test.only', 'test.skip',
                       'specify', 'specify.only', 'specify.skip' ];
 
+function getPropertyName(property) {
+    return property.name || property.value;
+}
+
 function getNodeName(node) {
     if (node.type === 'MemberExpression') {
-        return node.object.name + '.' + node.property.name;
+        return getNodeName(node.object) + '.' + getPropertyName(node.property);
     }
     return node.name;
 }
@@ -38,5 +42,7 @@ function isTestCase(node) {
 module.exports = {
   isDescribe: isDescribe,
   isHookIdentifier: isHookIdentifier,
-  isTestCase: isTestCase
+  isTestCase: isTestCase,
+  getPropertyName: getPropertyName,
+  getNodeName: getNodeName
 };
diff --git a/test/rules/no-exclusive-tests.js b/test/rules/no-exclusive-tests.js
@@ -22,7 +22,23 @@ ruleTester.run('no-exclusive-tests', rules['no-exclusive-tests'], {
         'var calledOnly = it.only; calledOnly.call(it)',
         'var dynamicOnly = "only"; suite[dynamicOnly]()',
         'specify()',
-        'specify.skip()'
+        'specify.skip()',
+        {
+            code: 'a.b.c.skip()',
+            settings: {
+                mocha: {
+                    additionalTestFunctions: [ 'a.b.c' ]
+                }
+            }
+        },
+        {
+            code: 'a[b].c.skip()',
+            settings: {
+                mocha: {
+                    additionalTestFunctions: [ 'a.b.c' ]
+                }
+            }
+        }
     ],
 
     invalid: [
@@ -105,7 +121,51 @@ ruleTester.run('no-exclusive-tests', rules['no-exclusive-tests'], {
                 }
             },
             errors: [ { message: expectedErrorMessage, column: 8, line: 1 } ]
+        },
+        {
+            code: 'foo.bar.only()',
+            settings: {
+                mocha: {
+                    additionalTestFunctions: [ 'foo.bar' ]
+                }
+            },
+            errors: [ { message: expectedErrorMessage, column: 9, line: 1 } ]
+        },
+        {
+            code: 'foo.bar["only"]()',
+            settings: {
+                mocha: {
+                    additionalTestFunctions: [ 'foo.bar' ]
+                }
+            },
+            errors: [ { message: expectedErrorMessage, column: 9, line: 1 } ]
+        },
+        {
+            code: 'foo["bar"].only()',
+            settings: {
+                mocha: {
+                    additionalTestFunctions: [ 'foo.bar' ]
+                }
+            },
+            errors: [ { message: expectedErrorMessage, column: 12, line: 1 } ]
+        },
+        {
+            code: 'foo["bar"]["only"]()',
+            settings: {
+                mocha: {
+                    additionalTestFunctions: [ 'foo.bar' ]
+                }
+            },
+            errors: [ { message: expectedErrorMessage, column: 12, line: 1 } ]
+        },
+        {
+            code: 'a.b.c.only()',
+            settings: {
+                mocha: {
+                    additionalTestFunctions: [ 'a.b.c' ]
+                }
+            },
+            errors: [ { message: expectedErrorMessage, column: 7, line: 1 } ]
         }
     ]
-
 });