From ea30ddbdbdad525780d01892086fdc88d3f02231 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Thu, 30 Apr 2015 14:05:17 +0200
Subject: try to add back code coverage

---
 .scrutinizer.yml | 6 +++---
 .travis.yml      | 4 ++--
 js/Gruntfile.js  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 765700a18..47ed1569a 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -18,9 +18,9 @@ imports:
     - php
     - javascript
 
-#tools:
-#    external_code_coverage:
-#        timeout: 600
+tools:
+    external_code_coverage:
+        timeout: 300
 
 checks:
     php:
diff --git a/.travis.yml b/.travis.yml
index 960f7a68f..c4eff52d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_script:
     # set up databases and users for postgres and mysql
     - createuser -U travis -s oc_autotest
     - mysql -e 'create database oc_autotest;'
-    - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost';"
+    - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
     - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
     # set up php under apache
     - bash owncloud/apps/news/tests/travis/travis-ci-apache.sh
@@ -57,7 +57,7 @@ before_script:
 script:
     # unit tests
     - grunt php-unit
-    #- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+    - php ocular.phar code-coverage:upload --format=php-clover ../coverage.clover
     - grunt js-unit
     # integration tests
     - grunt php-integration
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index 23b5273b7..6498867e2 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -177,7 +177,7 @@ module.exports = function (grunt) {
                     configuration: '../phpunit.xml'
                 }
             },
-            coverageUnit: {
+            coverage: {
                 options: {
                     colors: true,
                     configuration: '../phpunit.xml',
@@ -291,7 +291,7 @@ module.exports = function (grunt) {
     grunt.registerTask('dev-php-integration', ['watch:phpintegration']);
 
     grunt.registerTask('js-unit', ['default', 'karma:continuous']);
-    grunt.registerTask('php-unit', ['phpunit:coverageUnit']);
+    grunt.registerTask('php-unit', ['phpunit:coverage']);
     grunt.registerTask('php-integration', ['phpunit:integration']);
 
     grunt.registerTask('acceptance', ['protractor_webdriver', 'connect',
-- 
cgit v1.2.3