Skip to content

Commit dd6ebe2

Browse files
sindresorhussindresorhus
committed
fix XO lint issues
1 parent 0bf37b1 commit dd6ebe2

File tree

5 files changed

+159
-42
lines changed

5 files changed

+159
-42
lines changed

‎rules/assertion-arguments.js

+72-17
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,80 @@ var util = require('../util');
33
var createAvaRule = require('../create-ava-rule');
44

55
var expectedNbArguments = {
6-
deepEqual: {min: 2, max: 3},
7-
end: {min: 0, max: 0},
8-
fail: {min: 0, max: 1},
9-
false: {min: 1, max: 2},
10-
falsy: {min: 1, max: 2},
11-
ifError: {min: 1, max: 2},
12-
is: {min: 2, max: 3},
13-
not: {min: 2, max: 3},
14-
notDeepEqual: {min: 2, max: 3},
15-
notThrows: {min: 1, max: 2},
16-
pass: {min: 0, max: 1},
17-
plan: {min: 1, max: 1},
18-
regex: {min: 2, max: 3},
19-
notRegex: {min: 2, max: 3},
20-
throws: {min: 1, max: 3},
21-
true: {min: 1, max: 2},
22-
truthy: {min: 1, max: 2}
6+
deepEqual: {
7+
min: 2,
8+
max: 3
9+
},
10+
end: {
11+
min: 0,
12+
max: 0
13+
},
14+
fail: {
15+
min: 0,
16+
max: 1
17+
},
18+
false: {
19+
min: 1,
20+
max: 2
21+
},
22+
falsy: {
23+
min: 1,
24+
max: 2
25+
},
26+
ifError: {
27+
min: 1,
28+
max: 2
29+
},
30+
is: {
31+
min: 2,
32+
max: 3
33+
},
34+
not: {
35+
min: 2,
36+
max: 3
37+
},
38+
notDeepEqual: {
39+
min: 2,
40+
max: 3
41+
},
42+
notThrows: {
43+
min: 1,
44+
max: 2
45+
},
46+
pass: {
47+
min: 0,
48+
max: 1
49+
},
50+
plan: {
51+
min: 1,
52+
max: 1
53+
},
54+
regex: {
55+
min: 2,
56+
max: 3
57+
},
58+
notRegex: {
59+
min: 2,
60+
max: 3
61+
},
62+
throws: {
63+
min: 1,
64+
max: 3
65+
},
66+
true: {
67+
min: 1,
68+
max: 2
69+
},
70+
truthy: {
71+
min: 1,
72+
max: 2
73+
}
2374
};
2475

2576
function nbArguments(node) {
2677
var name = node.property.name;
2778
var nArgs = expectedNbArguments[name];
79+
2880
if (nArgs) {
2981
return nArgs;
3082
}
@@ -55,6 +107,7 @@ module.exports = function (context) {
55107
ava.isInTestNode
56108
)(function (node) {
57109
var callee = node.callee;
110+
58111
if (callee.type !== 'MemberExpression' ||
59112
!callee.property ||
60113
util.nameOfRootObject(callee) !== 't' ||
@@ -65,6 +118,7 @@ module.exports = function (context) {
65118

66119
var gottenArgs = node.arguments.length;
67120
var nArgs = nbArguments(callee);
121+
68122
if (!nArgs) {
69123
return;
70124
}
@@ -75,6 +129,7 @@ module.exports = function (context) {
75129
report(node, 'Too many arguments. Expected at most ' + nArgs.max + '.');
76130
} else if (enforcesMessage && nArgs.min !== nArgs.max) {
77131
var hasMessage = gottenArgs === nArgs.max;
132+
78133
if (!hasMessage && shouldHaveMessage) {
79134
report(node, 'Expected an assertion message, but found none.');
80135
} else if (hasMessage && !shouldHaveMessage) {

‎test/assertion-arguments.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const ruleTester = avaRuleTester(test, {
1010

1111
const missingError = 'Expected an assertion message, but found none.';
1212
const foundError = 'Expected no assertion message, but found one.';
13-
const tooFewError = (n) => `Not enough arguments. Expected at least ${n}.`;
14-
const tooManyError = (n) => `Too many arguments. Expected at most ${n}.`;
13+
const tooFewError = n => `Not enough arguments. Expected at least ${n}.`;
14+
const tooManyError = n => `Too many arguments. Expected at most ${n}.`;
1515

1616
const header = `const test = require('ava');`;
1717

‎test/no-unknown-modifiers.js

+32-8
Original file line numberDiff line numberDiff line change
@@ -34,49 +34,73 @@ ruleTester.run('no-unknown-modifiers', rule, {
3434
{
3535
code: `${header} test.foo(t => {});`,
3636
errors: [
37-
{...ruleError, message: 'Unknown test modifier `foo`.'}
37+
{
38+
...ruleError,
39+
message: 'Unknown test modifier `foo`.'
40+
}
3841
]
3942
},
4043
{
4144
code: `${header} test.onlu(t => {});`,
4245
errors: [
43-
{...ruleError, message: 'Unknown test modifier `onlu`.'}
46+
{
47+
...ruleError,
48+
message: 'Unknown test modifier `onlu`.'
49+
}
4450
]
4551
},
4652
{
4753
code: `${header} test.beforeeach(t => {});`,
4854
errors: [
49-
{...ruleError, message: 'Unknown test modifier `beforeeach`.'}
55+
{
56+
...ruleError,
57+
message: 'Unknown test modifier `beforeeach`.'
58+
}
5059
]
5160
},
5261
{
5362
code: `${header} test.c.only(t => {});`,
5463
errors: [
55-
{...ruleError, message: 'Unknown test modifier `c`.'}
64+
{
65+
...ruleError,
66+
message: 'Unknown test modifier `c`.'
67+
}
5668
]
5769
},
5870
{
5971
code: `${header} test.cb.onlu(t => {});`,
6072
errors: [
61-
{...ruleError, message: 'Unknown test modifier `onlu`.'}
73+
{
74+
...ruleError,
75+
message: 'Unknown test modifier `onlu`.'
76+
}
6277
]
6378
},
6479
{
6580
code: `${header} test.foo.bar.baz(t => {});`,
6681
errors: [
67-
{...ruleError, message: 'Unknown test modifier `foo`.'}
82+
{
83+
...ruleError,
84+
message: 'Unknown test modifier `foo`.'
85+
}
6886
]
6987
},
7088
{
7189
code: `${header} test.default(t => {});`,
7290
errors: [
73-
{...ruleError, message: 'Unknown test modifier `default`.'}
91+
{
92+
...ruleError,
93+
message: 'Unknown test modifier `default`.'
94+
}
7495
]
7596
},
7697
{
7798
code: `${header} test.test(t => {});`,
7899
errors: [
79-
{...ruleError, message: 'Unknown test modifier `test`.'}
100+
{
101+
...ruleError,
102+
message: 'Unknown test modifier `test`.'
103+
}
80104
]
81105
}
82106
]

‎test/use-t-well.js

+51-13
Original file line numberDiff line numberDiff line change
@@ -57,79 +57,117 @@ ruleTester.run('use-t-well', rule, {
5757
{
5858
code: testCase('t();'),
5959
errors: [
60-
{...ruleError, message: '`t` is not a function.'}
60+
{
61+
...ruleError,
62+
message: '`t` is not a function.'
63+
}
6164
]
6265
},
6366
{
6467
code: testCase('t.foo(a, a);'),
6568
errors: [
66-
{...ruleError, message: 'Unknown assertion method `foo`.'}
69+
{
70+
...ruleError,
71+
message: 'Unknown assertion method `foo`.'
72+
}
6773
]
6874
},
6975
{
7076
code: testCase('t.depEqual(a, a);'),
7177
errors: [
72-
{...ruleError, message: 'Unknown assertion method `depEqual`.'}
78+
{
79+
...ruleError,
80+
message: 'Unknown assertion method `depEqual`.'
81+
}
7382
]
7483
},
7584
{
7685
code: testCase('t.deepEqual.skp(a, a);'),
7786
errors: [
78-
{...ruleError, message: 'Unknown assertion method `skp`.'}
87+
{
88+
...ruleError,
89+
message: 'Unknown assertion method `skp`.'
90+
}
7991
]
8092
},
8193
{
8294
code: testCase('t.skp.deepEqual(a, a);'),
8395
errors: [
84-
{...ruleError, message: 'Unknown assertion method `skp`.'}
96+
{
97+
...ruleError,
98+
message: 'Unknown assertion method `skp`.'
99+
}
85100
]
86101
},
87102
{
88103
code: testCase('t.context();'),
89104
errors: [
90-
{...ruleError, message: 'Unknown assertion method `context`.'}
105+
{
106+
...ruleError,
107+
message: 'Unknown assertion method `context`.'}
91108
]
92109
},
93110
{
94111
code: testCase('t.a = 1;'),
95112
errors: [
96-
{...ruleError, message: 'Unknown member `a`. Use `context.a` instead.'}
113+
{
114+
...ruleError,
115+
message: 'Unknown member `a`. Use `context.a` instead.'
116+
}
97117
]
98118
},
99119
{
100120
code: testCase('t.ctx.a = 1;'),
101121
errors: [
102-
{...ruleError, message: 'Unknown member `ctx`. Use `context.ctx` instead.'}
122+
{
123+
...ruleError,
124+
message: 'Unknown member `ctx`. Use `context.ctx` instead.'
125+
}
103126
]
104127
},
105128
{
106129
code: testCase('t.deepEqu;'),
107130
errors: [
108-
{...ruleError, message: 'Unknown member `deepEqu`. Use `context.deepEqu` instead.'}
131+
{
132+
...ruleError,
133+
message: 'Unknown member `deepEqu`. Use `context.deepEqu` instead.'
134+
}
109135
]
110136
},
111137
{
112138
code: testCase('t.deepEqual.is(a, a);'),
113139
errors: [
114-
{...ruleError, message: `Can't chain assertion methods.`}
140+
{
141+
...ruleError,
142+
message: `Can't chain assertion methods.`
143+
}
115144
]
116145
},
117146
{
118147
code: testCase('t.paln(1);'),
119148
errors: [
120-
{...ruleError, message: 'Unknown assertion method `paln`.'}
149+
{
150+
...ruleError,
151+
message: 'Unknown assertion method `paln`.'
152+
}
121153
]
122154
},
123155
{
124156
code: testCase('t.skip();'),
125157
errors: [
126-
{...ruleError, message: 'Missing assertion method.'}
158+
{
159+
...ruleError,
160+
message: 'Missing assertion method.'
161+
}
127162
]
128163
},
129164
{
130165
code: testCase('t.deepEqual.skip.skip(a, a);'),
131166
errors: [
132-
{...ruleError, message: 'Too many chained uses of `skip`.'}
167+
{
168+
...ruleError,
169+
message: 'Too many chained uses of `skip`.'
170+
}
133171
]
134172
}
135173
]

‎util.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ exports.getAvaConfig = function (filepath) {
2626

2727
try {
2828
var packageContent = JSON.parse(fs.readFileSync(filepath, 'utf8'));
29-
return packageContent && packageContent.ava || defaultResult;
30-
} catch (e) {
29+
return (packageContent && packageContent.ava) || defaultResult;
30+
} catch (err) {
3131
return defaultResult;
3232
}
3333
};

0 commit comments

Comments
 (0)