Skip to content
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

Jump to bottom

feat: Removed phantomjs dependency #1204

Merged
merged 3 commits into from Nov 9, 2018
Merged

feat: Removed phantomjs dependency #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c31e72a
feat: Removed phantomjs dependency
ossdev07 Oct 16, 2018
b0793c6
Update karma.conf.js
ossdev07 Oct 16, 2018
dbbf05b
Update Makefile
ossdev07 Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ node_modules: package.json
# Tests
#

test: test-node test-phantom
test: test-node test-chrome

test-node: node_modules
@printf "==> [Test :: Node.js]\n"
Expand All @@ -61,10 +61,10 @@ test-cov: node_modules
--require ./test/bootstrap \
$(TESTS) \

test-phantom: clean-browser chai.js
@printf "==> [Test :: Karma (PhantomJS)]\n"
test-chrome: clean-browser chai.js
@printf "==> [Test :: Karma (chrome)]\n"
@./node_modules/karma/bin/karma start \
--single-run --browsers PhantomJS
--single-run --browsers HeadlessChrome

test-firefox: clean-browser chai.js
@printf "==> [Test :: Karma (Firefox)]\n"
Expand Down Expand Up @@ -101,6 +101,6 @@ clean-cov:
#

.PHONY: all
.PHONY: test test-all test-node test-phantom test-sauce test-cov
.PHONY: test test-all test-node test-chrome test-sauce test-cov
.PHONY: clean clean-node clean-browser clean-cov
.PHONY: release-patch release-minor release-major
8 changes: 7 additions & 1 deletion karma.conf.js
View file
Open in desktop
Expand Up @@ -10,7 +10,13 @@ module.exports = function(config) {
, colors: true
, logLevel: config.LOG_INFO
, autoWatch: false
, browsers: [ 'PhantomJS' ]
, browsers: [ 'HeadlessChrome' ]
, customLaunchers: {
HeadlessChrome: {
base: 'ChromeHeadless'
, flags: [ '--no-sandbox',]
, }
, }
, browserDisconnectTimeout: 10000
, browserDisconnectTolerance: 2
, browserNoActivityTimeout: 20000
Expand Down