Merge pull request #3071 from emanuelschuetze/travis
Added karma tests for angular.js to travis.
This commit is contained in:
commit
365a65ef7c
@ -23,6 +23,7 @@ script:
|
|||||||
- flake8 openslides tests
|
- flake8 openslides tests
|
||||||
- isort --check-only --recursive openslides tests
|
- isort --check-only --recursive openslides tests
|
||||||
- node_modules/.bin/gulp jshint
|
- 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
|
- DJANGO_SETTINGS_MODULE='tests.settings' coverage run ./manage.py test tests.unit
|
||||||
- coverage report --fail-under=44
|
- coverage report --fail-under=44
|
||||||
|
@ -23,8 +23,10 @@
|
|||||||
"jshint": "~2.9.2",
|
"jshint": "~2.9.2",
|
||||||
"karma": "~1.1.0",
|
"karma": "~1.1.0",
|
||||||
"karma-chrome-launcher": "~1.0.1",
|
"karma-chrome-launcher": "~1.0.1",
|
||||||
|
"karma-phantomjs-launcher": "~1.0.0",
|
||||||
"karma-jasmine": "~1.0.2",
|
"karma-jasmine": "~1.0.2",
|
||||||
"main-bower-files": "~2.11.1",
|
"main-bower-files": "~2.11.1",
|
||||||
|
"phantomjs-prebuilt": "~2.1.14",
|
||||||
"po2json": "~0.4.1",
|
"po2json": "~0.4.1",
|
||||||
"sprintf-js": "~1.0.3",
|
"sprintf-js": "~1.0.3",
|
||||||
"through2": "~2.0.0",
|
"through2": "~2.0.0",
|
||||||
|
@ -63,12 +63,12 @@ module.exports = function(config) {
|
|||||||
|
|
||||||
// start these browsers
|
// start these browsers
|
||||||
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
|
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
|
||||||
browsers: ['Chrome'],
|
browsers: ['Chrome', 'PhantomJS'],
|
||||||
|
|
||||||
|
|
||||||
// Continuous Integration mode
|
// Continuous Integration mode
|
||||||
// if true, Karma captures browsers, runs the tests and exits
|
// if true, Karma captures browsers, runs the tests and exits
|
||||||
singleRun: false,
|
singleRun: true,
|
||||||
|
|
||||||
// Concurrency level
|
// Concurrency level
|
||||||
// how many browser should be started simultaneous
|
// how many browser should be started simultaneous
|
||||||
|
Loading…
Reference in New Issue
Block a user