Skip to content

Commit 703517b

Browse files
committed
[Tests] fix 0.6 and linting
1 parent 11fb3d8 commit 703517b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.eslintrc

+3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22
"extends": "@ljharb",
33
"root": true,
44
"rules": {
5+
"array-bracket-newline": 0,
6+
"array-element-newline": 0,
57
"indent": [2, 4],
68
"strict": 0,
79
"complexity": 0,
810
"consistent-return": 0,
911
"curly": 0,
12+
"dot-notation": [2, { "allowKeywords": true }],
1013
"func-name-matching": 0,
1114
"func-style": 0,
1215
"global-require": 0,

.travis.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ node_js:
1616
- "0.6"
1717
before_install:
1818
- 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ]; then npm install -g [email protected] ; elif [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then case "$(npm --version)" in 1.*) npm install -g [email protected] ;; 2.*) npm install -g npm@2 ;; esac ; fi'
19-
- 'if [ "${TRAVIS_NODE_VERSION%${TRAVIS_NODE_VERSION#[0-9]}}" = "0" ] || [ "${TRAVIS_NODE_VERSION:0:4}" = "iojs" ]; then npm install -g [email protected] ; elif [ "${TRAVIS_NODE_VERSION}" != "0.6" ] && [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then npm install -g npm; fi'
19+
- 'if [ "${TRAVIS_NODE_VERSION}" != "0.6" ] && [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then if [ "${TRAVIS_NODE_VERSION%${TRAVIS_NODE_VERSION#[0-9]}}" = "0" ] || [ "${TRAVIS_NODE_VERSION:0:4}" = "iojs" ]; then npm install -g npm@4.5 ; else npm install -g npm; fi; fi'
2020
install:
21-
- 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ]; then nvm install 0.8 && npm install -g [email protected] && npm install -g [email protected] && npm install -g npm@2 && npm install && nvm use "${TRAVIS_NODE_VERSION}"; else npm install; fi;'
21+
- 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ]; then (nvm install 0.8 && npm install -g [email protected] && npm install -g [email protected] && npm install -g npm@2 && npm install); else npm install; fi;'
2222
script:
2323
- 'if [ -n "${PRETEST-}" ]; then npm run pretest ; fi'
2424
- 'if [ -n "${POSTTEST-}" ]; then npm run posttest ; fi'
@@ -154,8 +154,6 @@ matrix:
154154
env: TEST=true ALLOW_FAILURE=true
155155
- node_js: "0.9"
156156
env: TEST=true ALLOW_FAILURE=true
157-
- node_js: "0.6"
158-
env: TEST=true ALLOW_FAILURE=true
159157
- node_js: "0.4"
160158
env: TEST=true ALLOW_FAILURE=true
161159
##- node_js: "7"

lib/node-modules-paths.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ var parse = path.parse || require('path-parse');
44
module.exports = function nodeModulesPaths(start, opts) {
55
var modules = opts && opts.moduleDirectory
66
? [].concat(opts.moduleDirectory)
7-
: ['node_modules']
8-
;
7+
: ['node_modules'];
98

109
// ensure that `start` is an absolute path at this point,
1110
// resolving against the process' current working directory

0 commit comments

Comments
 (0)