test-title only errored when first argument is a function

fix avajs#185

Author: Guillaume Martigny

rules/test-title.js

@@ -5,47 +5,35 @@ const util = require('../util');
 
 const create = context => {
 	const ava = createAvaRule();
-	const ifMultiple = context.options[0] !== 'always';
-	let testCount = 0;
+	const functionTypes = [
+		'FunctionDeclaration',
+		'FunctionExpression',
+		'ArrowFunctionExpression'
+	];
 
 	return ava.merge({
 		CallExpression: visitIf([
 			ava.isInTestFile,
 			ava.isTestNode,
 			ava.hasNoHookModifier
 		])(node => {
-			testCount++;
+			const firstArgumentIsFunction = node.arguments.length < 1 || functionTypes.includes(node.arguments[0].type);
 
-			const requiredLength = ava.hasTestModifier('todo') ? 1 : 2;
-			const hasNoTitle = node.arguments.length < requiredLength;
-			const isOverThreshold = !ifMultiple || testCount > 1;
-
-			if (hasNoTitle && isOverThreshold) {
+			if (firstArgumentIsFunction) {
 				context.report({
 					node,
 					message: 'Test should have a title.'
 				});
 			}
-		}),
-		'Program:exit': () => {
-			testCount = 0;
-		}
+		})
 	});
 };
 
-const schema = [{
-	enum: [
-		'always',
-		'if-multiple'
-	]
-}];
-
 module.exports = {
 	create,
 	meta: {
 		docs: {
 			url: util.getDocsUrl(__filename)
-		},
-		schema
+		}
 	}
 };

test/test-title.js

@@ -13,99 +13,49 @@ const header = 'const test = require(\'ava\');\n';
 
 ruleTester.run('test-title', rule, {
 	valid: [
-		// Default options should be `['if-multiple']`
-		header + 'test(t => { t.pass(); t.end(); });',
-		{
-			code: header + 'test("my test name", t => { t.pass(); t.end(); });',
-			options: ['always']
-		},
-		{
-			code: header + 'test(`my test name`, t => { t.pass(); t.end(); });',
-			options: ['always']
-		},
-		{
-			code: header + 'test(\'my test name\', t => { t.pass(); t.end(); });',
-			options: ['always']
-		},
-		{
-			code: header + 'test.cb("my test name", t => { t.pass(); t.end(); });',
-			options: ['always']
-		},
-		{
-			code: header + 'test.todo("my test name");',
-			options: ['always']
-		},
-		{
-			code: header + 'test.before(t => {});',
-			options: ['always']
-		},
-		{
-			code: header + 'test.after(t => {});',
-			options: ['always']
-		},
-		{
-			code: header + 'test.beforeEach(t => {});',
-			options: ['always']
-		},
-		{
-			code: header + 'test.afterEach(t => {});',
-			options: ['always']
-		},
-		{
-			code: header + 'test.cb.before(t => {}); test.before.cb(t => {});',
-			options: ['always']
-		},
-		{
-			code: header + 'test(t => { t.pass(); t.end(); });',
-			options: ['if-multiple']
-		},
-		{
-			code: header + 'notTest(t => { t.pass(); t.end(); });',
-			options: ['always']
-		},
-		{
-			code: header + 'test(macroFn, arg1, arg2);',
-			options: ['always']
-		},
+		header + 'test("my test name", t => { t.pass(); t.end(); });',
+		header + 'test(`my test name`, t => { t.pass(); t.end(); });',
+		header + 'test(\'my test name\', t => { t.pass(); t.end(); });',
+		header + 'test.cb("my test name", t => { t.pass(); t.end(); });',
+		header + 'test.todo("my test name");',
+		header + 'test.before(t => {});',
+		header + 'test.after(t => {});',
+		header + 'test.beforeEach(t => {});',
+		header + 'test.afterEach(t => {});',
+		header + 'test.cb.before(t => {}); test.before.cb(t => {});',
+		header + 'notTest(t => { t.pass(); t.end(); });',
+		header + 'test([], arg1, arg2);',
+		header + 'test({}, arg1, arg2);',
 		// Shouldn't be triggered since it's not a test file
-		{
-			code: 'test(t => {});',
-			options: ['always']
-		}
+		'test(t => {});'
 	],
 	invalid: [
 		{
-			code: header + 'test(t => {}); test(t => {});',
+			code: header + 'test(t => {});',
+			errors
+		},
+		{
+			code: header + 'test(t => {}, "my test name");',
 			errors
 		},
 		{
 			code: header + 'test(t => { t.pass(); t.end(); });',
-			options: ['always'],
 			errors
 		},
 		{
 			code: header + 'test.cb(t => { t.pass(); t.end(); });',
-			options: ['always'],
 			errors
 		},
 		{
 			code: header + 'test.cb.skip(t => { t.pass(); t.end(); });',
-			options: ['always'],
 			errors
 		},
 		{
 			code: header + 'test(t => { t.pass(); t.end(); });',
-			options: ['always'],
 			errors
 		},
 		{
 			code: header + 'test.todo();',
-			options: ['always'],
-			errors
-		},
-		{
-			code: header + 'test(t => {}); test(t => {});',
-			options: ['if-multiple'],
 			errors
 		}
 	]