Skip to content

Commit

Permalink
Improve testem stuff
Browse files Browse the repository at this point in the history
* ensure we are building from the right directory
* also use chrome
* actually connect mocha’s output to testem
  • Loading branch information
stefanpenner committed Dec 22, 2017
1 parent 16ea714 commit 56776ba
Show file tree
Hide file tree
Showing 5 changed files with 1,130 additions and 77 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ node_js:
- "6"
- "4"

addons:
chrome: stable

before_install:
- nvm install 6
- nvm use 6
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"broccoli-stew": "^1.5.0",
"broccoli-uglify-js": "^0.2.0",
"broccoli-watchify": "^1.0.1",
"ember-cli": "2.17.1",
"ember-cli": "2.18.0-beta.2",
"ember-cli-dependency-checker": "^2.1.0",
"git-repo-version": "1.0.1",
"json3": "^3.3.2",
Expand Down Expand Up @@ -71,5 +71,8 @@
"license": "MIT",
"spm": {
"main": "dist/es6-promise.js"
},
"dependencies": {
"tap": "^11.0.1"
}
}
33 changes: 33 additions & 0 deletions testem.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
'use strict';

module.exports = {
test_page: "test/index.html",
parallel: 5,
frameworks: "mocha",
launchers: {
Mocha: {
"command": `./node_modules/.bin/mocha ${process.env.EMBER_CLI_TEST_OUTPUT}/test/browserify.js -R tap`,
"protocol": "tap"
}
},
launch_in_ci: [
"Phantomjs",
"Chrome",
"Mocha"
],
launch_in_dev: [
"Phantomjs",
"Chrome",
"Mocha"
],
browser_args: {
Chrome: {
args: [
'--disable-gpu',
'--headless',
'--remote-debugging-port=0',
'--window-size=1440,900'
]
}
}
};
14 changes: 0 additions & 14 deletions testem.json

This file was deleted.

Loading

0 comments on commit 56776ba

Please sign in to comment.