Skip to content

Commit e196c7a

Browse files
sindresorhussindresorhus
committed
Require Node.js 6
1 parent 07cb699 commit e196c7a

35 files changed

+83
-140
lines changed

‎.gitattributes

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
* text=auto
2-
*.js text eol=lf
1+
* text=auto eol=lf

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: node_js
22
node_js:
3+
- '10'
34
- '8'
45
- '6'
5-
- '4'
66
before_install:
77
- npm i -g npm
88
after_success: npm run coveralls

‎create-ava-rule.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,14 @@ module.exports = () => {
9595
hasTestModifier: mod => getTestModifierNames(currentTestNode).indexOf(mod) >= 0,
9696
hasNoHookModifier: () => {
9797
const modifiers = getTestModifierNames(currentTestNode);
98-
return modifiers.indexOf('before') === -1 &&
99-
modifiers.indexOf('beforeEach') === -1 &&
100-
modifiers.indexOf('after') === -1 &&
101-
modifiers.indexOf('afterEach') === -1;
98+
return !modifiers.includes('before') &&
99+
!modifiers.includes('beforeEach') &&
100+
!modifiers.includes('after') &&
101+
!modifiers.includes('afterEach');
102102
},
103103
isInTestFile: () => isTestFile,
104104
isInTestNode: () => currentTestNode,
105105
isTestNode: node => currentTestNode === node,
106-
merge: customHandlers => {
107-
return enhance.mergeVisitors([predefinedRules, customHandlers]);
108-
}
106+
merge: customHandlers => enhance.mergeVisitors([predefinedRules, customHandlers])
109107
};
110108
};

‎docs/rules/assertion-arguments.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ test(t => {
1818

1919
/* eslint ava/assertion-arguments: ["error", {"message": "always"}] */
2020
test(t => {
21-
t.true(array.indexOf(value) !== -1);
21+
t.true(array.includes(value));
2222
});
2323

2424
/* eslint ava/assertion-arguments: ["error", {"message": "never"}] */
2525
test(t => {
26-
t.true(array.indexOf(value) !== -1, 'value is not in array');
26+
t.true(array.includes(value), 'value is not in array');
2727
});
2828
```
2929

@@ -40,12 +40,12 @@ test(t => {
4040

4141
/* eslint ava/assertion-arguments: ["error", {"message": "always"}] */
4242
test(t => {
43-
t.true(array.indexOf(value) !== -1, 'value is not in array');
43+
t.true(array.includes(value), 'value is not in array');
4444
});
4545

4646
/* eslint ava/assertion-arguments: ["error", {"message": "never"}] */
4747
test(t => {
48-
t.true(array.indexOf(value) !== -1);
48+
t.true(array.includes(value));
4949
});
5050
```
5151

‎docs/rules/use-true-false.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import ava from 'ava';
1414
test(t => {
1515
t.truthy(value < 2);
1616
t.truthy(value === 1);
17-
t.falsy([1, 2, 3].indexOf(value) === -1);
17+
t.truthy([1, 2, 3].includes(value));
1818
t.falsy(!value);
1919
t.truthy(!!value);
2020
t.truthy(Array.isArray(value));
@@ -29,7 +29,7 @@ import ava from 'ava';
2929
test(t => {
3030
t.true(value < 2);
3131
t.true(value === 1);
32-
t.false([1, 2, 3].indexOf(value) === -1);
32+
t.true([1, 2, 3].includes(value));
3333
t.false(!value);
3434
t.true(!!value);
3535
t.true(Array.isArray(value));

‎package.json

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,8 @@
44
"description": "ESLint rules for AVA",
55
"license": "MIT",
66
"repository": "avajs/eslint-plugin-ava",
7-
"author": {
8-
"name": "Sindre Sorhus",
9-
"email": "[email protected]",
10-
"url": "sindresorhus.com"
11-
},
12-
"maintainers": [
13-
{
14-
"name": "Vadim Demedes",
15-
"email": "[email protected]",
16-
"url": "github.com/vdemedes"
17-
},
18-
{
19-
"name": "James Talmage",
20-
"email": "[email protected]",
21-
"url": "github.com/jamestalmage"
22-
},
23-
{
24-
"name": "Mark Wubben",
25-
"email": "[email protected]",
26-
"url": "novemberborn.net"
27-
},
28-
{
29-
"name": "Takuto Wada",
30-
"email": "[email protected]",
31-
"url": "github.com/twada"
32-
},
33-
{
34-
"name": "Jeroen Engels",
35-
"email": "[email protected]",
36-
"url": "github.com/jfmengels"
37-
}
38-
],
397
"engines": {
40-
"node": ">=4"
8+
"node": ">=6"
419
},
4210
"scripts": {
4311
"test": "nyc ava",

‎readme.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,6 @@ See the [ESLint docs](http://eslint.org/docs/user-guide/configuring#extending-co
116116
**Note**: This config will also enable the correct [parser options](http://eslint.org/docs/user-guide/configuring#specifying-parser-options) and [environment](http://eslint.org/docs/user-guide/configuring#specifying-environments).
117117

118118

119-
## Credit
120-
121-
- [AVA team](https://github.com/avajs/ava#team)
122-
- [Jeroen Engels](https://github.com/jfmengels)
123-
- [Takuto Wada](https://github.com/twada)
124-
- [Contributors…](https://github.com/avajs/eslint-plugin-ava/graphs/contributors)
125-
126-
127119
## License
128120

129-
MIT © [Sindre Sorhus](https://sindresorhus.com)
121+
MIT

‎rules/assertion-arguments.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
const visitIf = require('enhance-visitors').visitIf;
2+
const {visitIf} = require('enhance-visitors');
33
const util = require('../util');
44
const createAvaRule = require('../create-ava-rule');
55

@@ -89,9 +89,10 @@ const create = context => {
8989
ava.isInTestFile,
9090
ava.isInTestNode
9191
])(node => {
92-
const callee = node.callee;
92+
const {callee} = node;
9393

94-
if (callee.type !== 'MemberExpression' ||
94+
if (
95+
callee.type !== 'MemberExpression' ||
9596
!callee.property ||
9697
util.nameOfRootObject(callee) !== 't' ||
9798
util.isInContext(callee)
@@ -100,8 +101,7 @@ const create = context => {
100101
}
101102

102103
const gottenArgs = node.arguments.length;
103-
const members = util.getMembers(callee)
104-
.filter(name => name !== 'skip');
104+
const members = util.getMembers(callee).filter(name => name !== 'skip');
105105

106106
if (members[0] === 'end') {
107107
if (gottenArgs > 1) {

‎rules/assertion-message.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
const visitIf = require('enhance-visitors').visitIf;
2+
const {visitIf} = require('enhance-visitors');
33
const util = require('../util');
44
const createAvaRule = require('../create-ava-rule');
55

@@ -26,7 +26,7 @@ const create = context => {
2626
ava.isInTestFile,
2727
ava.isInTestNode
2828
])(node => {
29-
const callee = node.callee;
29+
const {callee} = node;
3030

3131
if (callee.type !== 'MemberExpression') {
3232
return;

‎rules/max-asserts.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
const visitIf = require('enhance-visitors').visitIf;
2+
const {visitIf} = require('enhance-visitors');
33
const util = require('../util');
44
const createAvaRule = require('../create-ava-rule');
55

@@ -16,17 +16,18 @@ const create = context => {
1616
ava.isInTestFile,
1717
ava.isInTestNode
1818
])(node => {
19-
const callee = node.callee;
19+
const {callee} = node;
2020

2121
if (callee.type !== 'MemberExpression') {
2222
return;
2323
}
2424

25-
if (callee.property &&
26-
notAssertionMethods.indexOf(callee.property.name) === -1 &&
27-
util.nameOfRootObject(callee) === 't') {
28-
const members = util.getMembers(callee)
29-
.filter(name => name !== 'skip');
25+
if (
26+
callee.property &&
27+
!notAssertionMethods.includes(callee.property.name) &&
28+
util.nameOfRootObject(callee) === 't'
29+
) {
30+
const members = util.getMembers(callee).filter(name => name !== 'skip');
3031

3132
if (!util.assertionMethods.has(members[0])) {
3233
return;

0 commit comments

Comments
 (0)