diff options
| author | Hendrik Leppelsack <hendrik@leppelsack.de> | 2016-03-25 16:22:59 +0100 |
|---|---|---|
| committer | Hendrik Leppelsack <hendrik@leppelsack.de> | 2016-03-25 16:22:59 +0100 |
| commit | b0c2b8e4380fafdfffcd9844235fb43e265cdaca (patch) | |
| tree | a51994c992fbfab51f74497fbbffce8a0c7357cf | |
| parent | 9ed868cf879a0adbb326f01fde296bcd667f39d7 (diff) | |
fix travis tests
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | bower.json | 3 | ||||
| -rw-r--r-- | karma.conf.js | 4 | ||||
| -rw-r--r-- | package.json | 6 |
4 files changed, 11 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 21dd3c25..f67149a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,10 @@ branches: - /^stable\d+(\.\d+)?$/ - /^v\d++(\.\d+)?+(\.\d+)?+(\.\d+)?$/ +before_install: + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start + script: - node_modules/.bin/bower install - node_modules/.bin/gulp eslint @@ -23,5 +27,3 @@ deploy: on: repo: owncloud/contacts tags: true - - @@ -29,6 +29,7 @@ "vcard": "0.2.4" }, "devDependencies": { - "angular-mocks": "1.5.0" + "angular-mocks": "1.5.0", + "underscore": "^1.8.3" } } diff --git a/karma.conf.js b/karma.conf.js index 58b66679..4ee11425 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -12,7 +12,6 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ - '../../core/vendor/underscore/underscore.js', 'js/vendor/angular/angular.js', 'js/vendor/angular-route/angular-route.js', 'js/vendor/angular-uuid4/angular-uuid4.js', @@ -23,6 +22,7 @@ module.exports = function(config) { 'js/dav/dav.js', 'js/vendor/vcard/src/vcard.js', + 'js/vendor/underscore/underscore.js', 'js/vendor/angular-mocks/angular-mocks.js', 'js/public/script.js', @@ -81,7 +81,7 @@ module.exports = function(config) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['Chrome'], + browsers: ['Firefox'], // Continuous Integration mode diff --git a/package.json b/package.json index 5784ce05..6a566fe8 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "devDependencies": { "bower": "", "chai": "^3.5.0", + "codecov": ">1.0.0", "gulp": "^3.9.0", "gulp-concat": "^2.6.0", "gulp-eslint": "^2.0.0", @@ -29,13 +30,12 @@ "gulp-sourcemaps": "^1.6.0", "karma": "^0.13.22", "karma-chai": "^0.1.0", - "karma-chrome-launcher": "^0.2.2", "karma-coverage": "^0.5.5", + "karma-firefox-launcher": "^0.1.7", "karma-mocha": "^0.2.2", "karma-mocha-reporter": "^2.0.0", "karma-sinon": "^1.0.4", "mocha": "^2.4.5", - "sinon": "^1.17.3", - "codecov": ">1.0.0" + "sinon": "^1.17.3" } } |