diff --git a/.travis.yml b/.travis.yml index 472e31682..92e229384 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ script: - flake8 openslides tests - isort --check-only --recursive openslides tests - node_modules/.bin/gulp jshint + - node_modules/.bin/karma start --browsers PhantomJS tests/karma/karma.conf.js - DJANGO_SETTINGS_MODULE='tests.settings' coverage run ./manage.py test tests.unit - coverage report --fail-under=44 diff --git a/package.json b/package.json index 1bcc82d1e..9b7240da2 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,10 @@ "jshint": "~2.9.2", "karma": "~1.1.0", "karma-chrome-launcher": "~1.0.1", + "karma-phantomjs-launcher": "~1.0.0", "karma-jasmine": "~1.0.2", "main-bower-files": "~2.11.1", + "phantomjs-prebuilt": "~2.1.14", "po2json": "~0.4.1", "sprintf-js": "~1.0.3", "through2": "~2.0.0", diff --git a/tests/karma/karma.conf.js b/tests/karma/karma.conf.js index d2d146d36..fa3ebf6a0 100644 --- a/tests/karma/karma.conf.js +++ b/tests/karma/karma.conf.js @@ -63,12 +63,12 @@ module.exports = function(config) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Chrome'], + browsers: ['Chrome', 'PhantomJS'], // Continuous Integration mode // if true, Karma captures browsers, runs the tests and exits - singleRun: false, + singleRun: true, // Concurrency level // how many browser should be started simultaneous