From c4463b432f6d357a54d494f23b753f800703851d Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Fri, 16 May 2014 20:26:00 +0200
Subject: more debug

---
 .travis.yml     | 8 +++++---
 js/Gruntfile.js | 4 ++--
 js/package.json | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b50253333..b74c427f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,6 @@ env:
 before_install:
   - sudo add-apt-repository -y ppa:chris-lea/node.js  # ubuntu 12.04 only
   - sudo apt-get update
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 
 install:
   - cd ..
@@ -52,10 +50,14 @@ script:
   - webdriver-manager update
   - sudo chown -R www-data:www-data ../../../data
   - sudo chown -R www-data:www-data ../../../config
+  - ls -l ../../../
+  - ls -l ../../../config
   - sudo apt-get install curl
   - curl http://localhost/owncloud/index.php
-  - grunt ci --verbose
+  - grunt ci-unit --verbose
+  - grunt ci-e2e --verbose
 
 addons:
   postgresql: "9.3"
 
+
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index 8d86bf34c..491a4922a 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -183,6 +183,6 @@ module.exports = function (grunt) {
     grunt.registerTask('default', ['jslint', 'concat', 'ngmin', 'wrap']);
     grunt.registerTask('test', ['karma:unit']);
     grunt.registerTask('e2e', ['protractor_webdriver', 'connect', 'protractor:chrome']);
-    grunt.registerTask('ci', ['default', 'karma:continuous', 'protractor_webdriver', 'connect', 'protractor:phantomjs']);
-
+    grunt.registerTask('ci-unit', ['default', 'karma:continuous']);
+    grunt.registerTask('ci-e2e', ['protractor_webdriver', 'connect', 'protractor:phantomjs']);
 };
\ No newline at end of file
diff --git a/js/package.json b/js/package.json
index c11f0cb07..6a6cea1ac 100644
--- a/js/package.json
+++ b/js/package.json
@@ -4,7 +4,7 @@
   "description": "An RSS/Atom feed reader",
   "main": "build/app.js",
   "scripts": {
-    "test": "grunt ci"
+    "test": "grunt ci-unit"
   },
   "repository": {
     "type": "git",
-- 
cgit v1.2.3