From c1cd7da74ac55abee856637c8bb75b385a444d1a Mon Sep 17 00:00:00 2001 From: Mark Wubben Date: Sat, 10 Jul 2021 15:52:45 +0200 Subject: [PATCH] Simplify use-t to only check the first parameter --- docs/rules/use-t.md | 8 -------- rules/use-t.js | 9 ++------- test/use-t.js | 19 ++----------------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/docs/rules/use-t.md b/docs/rules/use-t.md index 22d4ddf9..ee4160d8 100644 --- a/docs/rules/use-t.md +++ b/docs/rules/use-t.md @@ -12,14 +12,6 @@ const test = require('ava'); test('foo', foo => { // Incorrect name t.pass(); }); - -test('bar', (t, bar) => { // too many arguments - t.pass(); -}); - -test('baz', (bar, t) => { // too many arguments - t.pass(); -}); ``` ### Pass diff --git a/rules/use-t.js b/rules/use-t.js index 70940f40..f1b20178 100644 --- a/rules/use-t.js +++ b/rules/use-t.js @@ -18,16 +18,11 @@ const create = context => { const functionArg = node.arguments[functionArgIndex]; - if (!(functionArg && functionArg.params && functionArg.params.length > 0)) { + if (!functionArg || !functionArg.params || functionArg.params.length === 0) { return; } - if (functionArg.params.length > 1) { - context.report({ - node, - message: 'Test should only have one parameter named `t`.' - }); - } else if (functionArg.params[0].name !== 't') { + if (functionArg.params[0].name !== 't') { context.report({ node, message: 'Test parameter should be named `t`.' diff --git a/test/use-t.js b/test/use-t.js index 2471538a..b26af072 100644 --- a/test/use-t.js +++ b/test/use-t.js @@ -15,10 +15,6 @@ const parameterNotNamedTErrors = [{ message: 'Test parameter should be named `t`.' }]; -const tooManyParametersErrors = [{ - message: 'Test should only have one parameter named `t`.' -}]; - const header = 'const test = require(\'ava\');\n'; ruleTester.run('use-t', rule, { @@ -27,7 +23,8 @@ ruleTester.run('use-t', rule, { header + 'test(() => {});', header + 'test(t => {});', header + 'test.cb(t => {});', - // Header + 'test("test name", t => {});', + header + 'test("test name", t => {});', + header + 'test((t, foo) => {});', header + 'test(function (t) {});', header + 'test(testFunction);', header + 'test.todo("test name");', @@ -53,18 +50,6 @@ ruleTester.run('use-t', rule, { { code: header + 'test(function (foo) {});', errors: parameterNotNamedTErrors - }, - { - code: header + 'test((t, foo) => {});', - errors: tooManyParametersErrors - }, - { - code: header + 'test((foo, t) => {});', - errors: tooManyParametersErrors - }, - { - code: header + 'test("test name", (t, foo) => {});', - errors: tooManyParametersErrors } ] });