Skip to content

Commit

Permalink
replace phantomjs with headless_chrome
Browse files Browse the repository at this point in the history
phantomjs doesn't support es6 (ariya/phantomjs#14506)
  • Loading branch information
jupe authored and Jussi Vatjus-Anttila committed Oct 17, 2017
1 parent e51ff7a commit 492c84d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
MOCHA_FILE: junit/test-results.xml
- run:
name: test-browser
command: npm run test-browser || true
command: npm run test-browser
- run:
name: lint
command: npm run lint
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ BROWSERIFY ?= browserify
MINIFY ?= minify
REPORTER ?= spec
MOCHA ?= mocha
MOCHA_PHANTOMJS ?= mocha-phantomjs
MOCHA_HEADLESS_CHROME ?= node_modules/mocha-headless-chrome/bin/start
#FILTER ?= .+
BROWSERIFIED ?= dist/opentmi-client.js
MINIFIED ?= dist/opentmi-client.min.js
Expand Down Expand Up @@ -35,7 +35,7 @@ ${BROWSER_TEST} : $(shell ${BROWSERIFY} --list ${TESTS})


test-browser: bower-install ${BROWSER_TEST}
${MOCHA_PHANTOMJS} -p node_modules/phantomjs/bin/phantomjs -R ${REPORTER} -g '${FILTER}' test/index.html
${MOCHA_HEADLESS_CHROME} -f test/index.html

test-node:
NODE_ENV=test ${MOCHA} --reporter $(REPORTER) --recursive -g '${FILTER}'
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"debug": "^3.1.0",
"invariant": "^2.2.2",
"lodash": "^4.17.4",
"mocha-junit-reporter": "^1.14.0",

"socket.io-client": "^2.0.3"
},
"devDependencies": {
Expand All @@ -53,7 +53,8 @@
"istanbul": "^0.4.3",
"jsdoc": "^3.5.5",
"mocha": "^4.0.1",
"mocha-phantomjs": "^4.1.0",
"mocha-headless-chrome": "^1.5.3",
"mocha-junit-reporter": "^1.14.0",
"moxios": "^0.4.0",
"sinon": "^4.0.1",
"socket.io": "^2.0.3",
Expand Down

0 comments on commit 492c84d

Please sign in to comment.