diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | js/Gruntfile.js | 10 | ||||
| -rw-r--r-- | js/karma.conf.js | 8 | ||||
| -rw-r--r-- | templates/main.php | 1 |
4 files changed, 11 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 6760e1dae..dd0542259 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,14 @@ env: before_install: # get a newer node.js version + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" - sudo add-apt-repository -y ppa:chris-lea/node.js # ubuntu 12.04 only - sudo apt-get update install: - cd .. - - sudo apt-get -y install nodejs python3-jinja2 python3-setuptools apache2 libapache2-mod-fastcgi + - sudo apt-get -y install nodejs python3-jinja2 python3-setuptools apache2 libapache2-mod-fastcgi firefox - sudo easy_install3 pip # ubuntu 12.04 only - sudo pip3 install ocdev # get a newer phantomjs version diff --git a/js/Gruntfile.js b/js/Gruntfile.js index e40900f5a..844461e1f 100644 --- a/js/Gruntfile.js +++ b/js/Gruntfile.js @@ -134,16 +134,6 @@ module.exports = function (grunt) { continuous: { configFile: 'karma.conf.js', singleRun: true, - browsers: ['PhantomJS'], - preprocessors: { - 'build/app.js': 'coverage' - }, - coverageReporter: { - type: 'lcovonly', - dir: 'coverage/', - file: 'coverage.lcov' - }, - reporters: ['coverage'] } }, phpunit: { diff --git a/js/karma.conf.js b/js/karma.conf.js index 73c083350..504d4155b 100644 --- a/js/karma.conf.js +++ b/js/karma.conf.js @@ -15,6 +15,7 @@ module.exports = function (config) { frameworks: ['jasmine', 'traceur'], preprocessors: { + 'build/app.js': ['coverage'], 'tests/unit/stubs/*.js': ['traceur'], 'controller/**/*.js': ['traceur'], 'filter/**/*.js': ['traceur'], @@ -57,11 +58,16 @@ module.exports = function (config) { ], + coverageReporter: { + type: 'lcovonly', + dir: 'coverage/', + file: 'coverage.lcov' + }, // test results reporter to use // possible values: 'dots', 'progress' // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['progress'], + reporters: ['coverage'], // web server port diff --git a/templates/main.php b/templates/main.php index 465dadaba..f4a4263d6 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,4 +1,5 @@ <?php +\OCP\Util::addScript('news', 'vendor/traceur-runtime/traceur-runtime'); \OCP\Util::addScript('news', 'vendor/angular/angular'); \OCP\Util::addScript('news', 'vendor/angular-route/angular-route'); \OCP\Util::addScript('news', 'vendor/angular-sanitize/angular-sanitize'); |