Skip to content

test(ci): NODE 6 continuous integration #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

test(ci): NODE 6 continuous integration #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ sudo: false
env:
- NODE_VERSION=5 SCRIPT=lint
- NODE_VERSION=5 SCRIPT=test
- NODE_VERSION=6 SCRIPT=test
os:
- linux
- osx
Expand All @@ -14,7 +15,7 @@ script:
- npm run-script $SCRIPT

before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.1/install.sh | bash; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source ~/.nvm/nvm-exec; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap caskroom/cask; fi
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"exists-sync": "0.0.3",
"minimatch": "^3.0.0",
"mocha": "^2.4.5",
"mock-fs": "^3.8.0",
"mock-fs": "^3.9.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this dependency need updating?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mike has told me it was to support node 6.

Copy link
Contributor Author

@jkuri jkuri Apr 30, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the update I was waiting for, before it was not supporting node6.

"object-assign": "^4.0.1",
"rewire": "^2.5.1",
"sinon": "^1.17.3",
Expand Down
15 changes: 5 additions & 10 deletions tests/helpers/tmp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
'use strict';

var fs = require('fs-extra');
var existsSync = require('exists-sync');
var Promise = require('ember-cli/lib/ext/promise');
var remove = Promise.denodeify(fs.remove);
var root = process.cwd();

module.exports.setup = function (path) {
process.chdir(root);
fs.removeSync(path);
fs.ensureDirSync(path);

return remove(path).then(function () {
fs.mkdirsSync(path);
});
return Promise.resolve();
};

module.exports.teardown = function (path) {
process.chdir(root);
fs.removeSync(path);

if (existsSync(path)) {
return remove(path);
} else {
return Promise.resolve();
}
return Promise.resolve();
};