diff options
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | js/config/app.js | 2 | ||||
| -rw-r--r-- | js/config/config.js | 2 | ||||
| -rw-r--r-- | js/config/protractor.js | 2 | ||||
| -rw-r--r-- | js/config/run.js | 2 | ||||
| -rw-r--r-- | js/service/loading.js | 2 | ||||
| -rw-r--r-- | js/service/setup.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/controller/AllItemsControllerSpec.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/service/LoadingSpec.js | 2 |
9 files changed, 16 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 3a18956b5..26f587c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,23 +4,24 @@ php: - 5.5 before_install: - - cd .. + - sudo add-apt-repository -y ppa:chris-lea/node.js + - sudo apt-get update + - sudo apt-get -y install nodejs chromium python3-pip + - wget https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2 + - tar xjf phantomjs-1.9.0-linux-x86_64.tar.bz2 + - sudo ln -s $(pwd)/phantomjs-1.9.0-linux-x86_64/bin/phantomjs /usr/bin/phantomjs - sudo pip3 install ocdev + - cd .. - ocdev setup core --dir owncloud - mv news core/apps/ - cd ../apps/news script: - - sudo add-apt-repository -y ppa:chris-lea/node.js - - sudo apt-get update - - sudo apt-get -y install nodejs chromium - - wget https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2 - - tar xjf phantomjs-1.9.0-linux-x86_64.tar.bz2 - - sudo ln -s $(pwd)/phantomjs-1.9.0-linux-x86_64/bin/phantomjs /usr/bin/phantomjs - phpunit --coverage-clover=coverage.clover tests/unit - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover coverage.clover - cd js/ + - npm install -g grunt-cli - npm install - npm test #- export DISPLAY=:99.0 diff --git a/js/config/app.js b/js/config/app.js index 271de3fd0..947a68a2e 100644 --- a/js/config/app.js +++ b/js/config/app.js @@ -5,6 +5,6 @@ * later. See the COPYING file. * * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2012, 2014 + * @copyright Bernhard Posselt 2014 */ var app = angular.module('News', ['ngRoute', 'ngSanitize', 'ngAnimate']);
\ No newline at end of file diff --git a/js/config/config.js b/js/config/config.js index 88c965856..776f4ee92 100644 --- a/js/config/config.js +++ b/js/config/config.js @@ -5,7 +5,7 @@ * later. See the COPYING file. * * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2012, 2014 + * @copyright Bernhard Posselt 2014 */ app.config(function ($routeProvider, $provide) { 'use strict'; diff --git a/js/config/protractor.js b/js/config/protractor.js index 364ff7bfe..6193d5c99 100644 --- a/js/config/protractor.js +++ b/js/config/protractor.js @@ -5,7 +5,7 @@ * later. See the COPYING file. * * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2012, 2014 + * @copyright Bernhard Posselt 2014 */ var baseUrl = 'http://localhost'; diff --git a/js/config/run.js b/js/config/run.js index 2bf9de7d6..00e71a7b0 100644 --- a/js/config/run.js +++ b/js/config/run.js @@ -5,7 +5,7 @@ * later. See the COPYING file. * * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2012, 2014 + * @copyright Bernhard Posselt 2014 */ app.run(function ($rootScope, $location, Loading, Setup) { 'use strict'; diff --git a/js/service/loading.js b/js/service/loading.js index e15d0fd7a..e6fcb73d1 100644 --- a/js/service/loading.js +++ b/js/service/loading.js @@ -5,7 +5,7 @@ * later. See the COPYING file. * * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2012, 2014 + * @copyright Bernhard Posselt 2014 */ app.service('Loading', function () { 'use strict'; diff --git a/js/service/setup.js b/js/service/setup.js index 07f4c605f..dcb289643 100644 --- a/js/service/setup.js +++ b/js/service/setup.js @@ -5,7 +5,7 @@ * later. See the COPYING file. * * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2012, 2014 + * @copyright Bernhard Posselt 2014 */ app.service('Setup', function () { 'use strict'; diff --git a/js/tests/unit/controller/AllItemsControllerSpec.js b/js/tests/unit/controller/AllItemsControllerSpec.js index 63cf55536..74292e628 100644 --- a/js/tests/unit/controller/AllItemsControllerSpec.js +++ b/js/tests/unit/controller/AllItemsControllerSpec.js @@ -5,7 +5,7 @@ * later. See the COPYING file. * * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2012, 2014 + * @copyright Bernhard Posselt 2014 */ describe('AllItemsController', function () { 'use strict'; diff --git a/js/tests/unit/service/LoadingSpec.js b/js/tests/unit/service/LoadingSpec.js index 0067b6015..f8146b87f 100644 --- a/js/tests/unit/service/LoadingSpec.js +++ b/js/tests/unit/service/LoadingSpec.js @@ -5,7 +5,7 @@ * later. See the COPYING file. * * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2012, 2014 + * @copyright Bernhard Posselt 2014 */ describe('Loading', function () { 'use strict'; |