summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-09-14 20:06:59 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2015-09-14 20:06:59 +0200
commit901b51109e0deb1b5f76b5713c1f83936e9f26cc (patch)
treeb17b89d8d6ced7e855603861f553e794d085b3f5
parentac88afa2e643979a9c461253b40d149b685ef77d (diff)
try to fix travis
-rw-r--r--.travis.yml3
-rw-r--r--js/Gruntfile.js4
2 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 11e05959f..9abefc6f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,9 +73,6 @@ script:
- grunt js-unit
# integration tests
- grunt php-integration
- - cd ../../../
- - ./occ news:verify-install
- - cd apps/news/js
# acceptance tests
- webdriver-manager update
- sudo chown -R www-data:www-data ../../../data
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index 6498867e2..34899a60b 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -290,11 +290,11 @@ module.exports = function (grunt) {
grunt.registerTask('dev-php-unit', ['watch:phpunit']);
grunt.registerTask('dev-php-integration', ['watch:phpintegration']);
- grunt.registerTask('js-unit', ['default', 'karma:continuous']);
+ grunt.registerTask('js-unit', ['karma:continuous']);
grunt.registerTask('php-unit', ['phpunit:coverage']);
grunt.registerTask('php-integration', ['phpunit:integration']);
grunt.registerTask('acceptance', ['protractor_webdriver', 'connect',
'protractor']);
-}; \ No newline at end of file
+};