test(ci): node6 support

Author: jkuri

.travis.yml

@@ -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
@@ -14,9 +15,11 @@ 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 source ~/.nvm/nvm-exec; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install nvm; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir ~/.nvm; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export NVM_DIR="/usr/local/opt/nvm"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source "$(brew --prefix nvm)/nvm.sh"; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap caskroom/cask; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install google-chrome; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi

package.json

@@ -65,7 +65,7 @@
     "exists-sync": "0.0.3",
     "minimatch": "^3.0.0",
     "mocha": "^2.4.5",
-    "mock-fs": "^3.8.0",
+    "mock-fs": "^3.9.0",
     "object-assign": "^4.0.1",
     "rewire": "^2.5.1",
     "sinon": "^1.17.3",

tests/helpers/tmp.js

@@ -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();
 };