Skip to content

Commit f9c5b6c

Browse files
committed
test(ci): node6 support
1 parent 69cdb28 commit f9c5b6c

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ sudo: false
22
env:
33
- NODE_VERSION=5 SCRIPT=lint
44
- NODE_VERSION=5 SCRIPT=test
5+
- NODE_VERSION=6 SCRIPT=test
56
os:
67
- linux
78
- osx
@@ -14,8 +15,7 @@ script:
1415
- npm run-script $SCRIPT
1516

1617
before_install:
17-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.1/install.sh | bash; fi
18-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source ~/.nvm/nvm-exec; fi
18+
- curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash
1919
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
2020
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap caskroom/cask; fi
2121
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install google-chrome; fi

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"url": "https://github.com/angular/angular-cli.git"
1818
},
1919
"engines": {
20-
"node": ">= 4.1.0"
20+
"node": ">= 5.0.0"
2121
},
2222
"author": "Angular Authors",
2323
"contributors": [
@@ -65,7 +65,7 @@
6565
"exists-sync": "0.0.3",
6666
"minimatch": "^3.0.0",
6767
"mocha": "^2.4.5",
68-
"mock-fs": "^3.8.0",
68+
"mock-fs": "^3.9.0",
6969
"object-assign": "^4.0.1",
7070
"rewire": "^2.5.1",
7171
"sinon": "^1.17.3",

tests/helpers/tmp.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,19 @@
33
var fs = require('fs-extra');
44
var existsSync = require('exists-sync');
55
var Promise = require('ember-cli/lib/ext/promise');
6-
var remove = Promise.denodeify(fs.remove);
76
var root = process.cwd();
87

98
module.exports.setup = function (path) {
109
process.chdir(root);
10+
fs.removeSync(path);
11+
fs.ensureDirSync(path);
1112

12-
return remove(path).then(function () {
13-
fs.mkdirsSync(path);
14-
});
13+
return Promise.resolve();
1514
};
1615

1716
module.exports.teardown = function (path) {
1817
process.chdir(root);
18+
fs.removeSync(path);
1919

20-
if (existsSync(path)) {
21-
return remove(path);
22-
} else {
23-
return Promise.resolve();
24-
}
20+
return Promise.resolve();
2521
};

0 commit comments

Comments
 (0)