Skip to content

Commit 768e82a

Browse files
author
redaktice
committed
Converting to ES2015, inspired by georgie105
More cleanup updating linters and more fixes Updating travis ci and removing lint errors Updating CI test runner and eslint for console logs Working on mocha tests, because context is a thing More mild approach Updating version and more ES2015 conversion
1 parent d1f3fcc commit 768e82a

File tree

10 files changed

+1367
-1166
lines changed

10 files changed

+1367
-1166
lines changed

.eslintrc.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
root: true
2-
extends: standard
2+
extends:
3+
- 'eslint:recommended'
4+
- 'plugin:node/recommended'
35
rules:
46
no-param-reassign: error
57
no-shadow: error
8+
no-console: off

.travis.yml

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
language: node_js
22
node_js:
3-
- "0.10"
4-
- "0.12"
5-
- "1.8"
6-
- "2.5"
7-
- "3.3"
8-
- "4.9"
9-
- "5.12"
10-
- "6.16"
11-
- "7.10"
12-
- "8.15"
13-
- "9.11"
3+
- '8.15'
4+
- '9.11'
5+
- 10
6+
- 11
7+
- 12
148
matrix:
159
fast_finish: true
1610
sudo: false
@@ -22,33 +16,6 @@ before_install:
2216
- |
2317
# Skip updating shrinkwrap / lock
2418
npm config set shrinkwrap false
25-
# Setup Node.js version-specific dependencies
26-
- |
27-
# eslint for linting
28-
# - remove on Node.js < 6
29-
if [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -lt 6 ]]; then
30-
node -pe 'Object.keys(require("./package").devDependencies).join("\n")' | \
31-
grep -E '^eslint(-|$)' | \
32-
xargs npm rm --save-dev
33-
fi
34-
- |
35-
# mocha for testing
36-
# - use 3.x for Node.js < 4
37-
# - use 5.x for Node.js < 6
38-
if [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -lt 4 ]]; then
39-
npm install --save-dev mocha@3.5.3
40-
elif [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -lt 6 ]]; then
41-
npm install --save-dev mocha@5.2.0
42-
fi
43-
- |
44-
# supertest for http calls
45-
# - use 2.0.0 for Node.js < 4
46-
# - use 3.4.2 for Node.js < 6
47-
if [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -lt 4 ]]; then
48-
npm install --save-dev supertest@2.0.0
49-
elif [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -lt 6 ]]; then
50-
npm install --save-dev supertest@3.4.2
51-
fi
5219
# Update Node.js modules
5320
- |
5421
# Prune and rebuild node_modules

appveyor.yml

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
environment:
22
matrix:
3-
- nodejs_version: "0.10"
4-
- nodejs_version: "0.12"
5-
- nodejs_version: "1.8"
6-
- nodejs_version: "2.5"
7-
- nodejs_version: "3.3"
8-
- nodejs_version: "4.9"
9-
- nodejs_version: "5.12"
10-
- nodejs_version: "6.16"
11-
- nodejs_version: "7.10"
12-
- nodejs_version: "8.15"
13-
- nodejs_version: "9.11"
3+
- nodejs_version: '8.15'
4+
- nodejs_version: '9.11'
5+
- nodejs_version: '10'
6+
- nodejs_version: '11'
7+
- nodejs_version: '12'
148
cache:
159
- node_modules
1610
install:
@@ -28,25 +22,6 @@ install:
2822
cmd.exe /c "node -pe `"Object.keys(require('./package').devDependencies).join('\n')`"" | `
2923
sls "^eslint(-|$)" | `
3024
%{ npm rm --silent --save-dev $_ }
31-
# Setup Node.js version-specific dependencies
32-
- ps: |
33-
# mocha for testing
34-
# - use 3.x for Node.js < 4
35-
# - use 5.x for Node.js < 6
36-
if ([int]$env:nodejs_version.split(".")[0] -lt 4) {
37-
npm install --silent --save-dev mocha@3.5.3
38-
} elseif ([int]$env:nodejs_version.split(".")[0] -lt 6) {
39-
npm install --silent --save-dev mocha@5.2.0
40-
}
41-
- ps: |
42-
# supertest for http calls
43-
# - use 2.0.0 for Node.js < 4
44-
# - use 3.4.2 for Node.js < 6
45-
if ([int]$env:nodejs_version.split(".")[0] -lt 4) {
46-
npm install --silent --save-dev supertest@2.0.0
47-
} elseif ([int]$env:nodejs_version.split(".")[0] -lt 6) {
48-
npm install --silent --save-dev supertest@3.4.2
49-
}
5025
# Update Node.js modules
5126
- ps: |
5227
# Prune & rebuild node_modules
@@ -64,4 +39,4 @@ test_script:
6439
npm --version
6540
# Run test script
6641
- npm run test-ci
67-
version: "{build}"
42+
version: '{build}'

0 commit comments

Comments
 (0)