Skip to content

Commit c1cd7da

Browse files
committed
Simplify use-t to only check the first parameter
1 parent dee1802 commit c1cd7da

File tree

3 files changed

+4
-32
lines changed

3 files changed

+4
-32
lines changed

docs/rules/use-t.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ const test = require('ava');
1212
test('foo', foo => { // Incorrect name
1313
t.pass();
1414
});
15-
16-
test('bar', (t, bar) => { // too many arguments
17-
t.pass();
18-
});
19-
20-
test('baz', (bar, t) => { // too many arguments
21-
t.pass();
22-
});
2315
```
2416

2517
### Pass

rules/use-t.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,11 @@ const create = context => {
1818

1919
const functionArg = node.arguments[functionArgIndex];
2020

21-
if (!(functionArg && functionArg.params && functionArg.params.length > 0)) {
21+
if (!functionArg || !functionArg.params || functionArg.params.length === 0) {
2222
return;
2323
}
2424

25-
if (functionArg.params.length > 1) {
26-
context.report({
27-
node,
28-
message: 'Test should only have one parameter named `t`.'
29-
});
30-
} else if (functionArg.params[0].name !== 't') {
25+
if (functionArg.params[0].name !== 't') {
3126
context.report({
3227
node,
3328
message: 'Test parameter should be named `t`.'

test/use-t.js

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ const parameterNotNamedTErrors = [{
1515
message: 'Test parameter should be named `t`.'
1616
}];
1717

18-
const tooManyParametersErrors = [{
19-
message: 'Test should only have one parameter named `t`.'
20-
}];
21-
2218
const header = 'const test = require(\'ava\');\n';
2319

2420
ruleTester.run('use-t', rule, {
@@ -27,7 +23,8 @@ ruleTester.run('use-t', rule, {
2723
header + 'test(() => {});',
2824
header + 'test(t => {});',
2925
header + 'test.cb(t => {});',
30-
// Header + 'test("test name", t => {});',
26+
header + 'test("test name", t => {});',
27+
header + 'test((t, foo) => {});',
3128
header + 'test(function (t) {});',
3229
header + 'test(testFunction);',
3330
header + 'test.todo("test name");',
@@ -53,18 +50,6 @@ ruleTester.run('use-t', rule, {
5350
{
5451
code: header + 'test(function (foo) {});',
5552
errors: parameterNotNamedTErrors
56-
},
57-
{
58-
code: header + 'test((t, foo) => {});',
59-
errors: tooManyParametersErrors
60-
},
61-
{
62-
code: header + 'test((foo, t) => {});',
63-
errors: tooManyParametersErrors
64-
},
65-
{
66-
code: header + 'test("test name", (t, foo) => {});',
67-
errors: tooManyParametersErrors
6853
}
6954
]
7055
});

0 commit comments

Comments
 (0)