From c9f46e2e3caa20d597315cd2fa85b0cce15c4c3b Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Thu, 6 Nov 2014 10:17:47 +0100
Subject: run integration tests on travis

---
 .travis.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index a5dfa597b..e5b14ea3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,22 +47,22 @@ before_script:
     - cd owncloud
     - ocdev ci $DB
     - php -f console.php app:enable news
-    - cd apps/news
+    - cd apps/news/js
+    # install test deps
+    - npm install --deps # npm install needs to run before sudo npm install because otherwise it fails because a tmp file exists in the home dir
+    - sudo npm -g install grunt-cli protractor
+    - wget https://scrutinizer-ci.com/ocular.phar
 
 script:
-    # php unit tests
-    - phpunit --coverage-clover=coverage.clover -c phpunit.xml
-    - wget https://scrutinizer-ci.com/ocular.phar
+    # unit tests
+    - grunt php-unit
     - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-    - cd js/
-    # install javascript deps (putting it into install section fails often)
-    - npm install --deps # npm install needs to run before sudo npm install because otherwise it fails because a tmp file exists in the home dir
-    - sudo npm -g install grunt-cli protractor
-    # js unit tests
-    - grunt ci-unit
+    - grunt js-unit
+    # integration tests
+    - grunt php-integration
     # acceptance tests
-    #- webdriver-manager update
-    #- grunt ci-e2e --verbose
+    - webdriver-manager update
+    #- grunt acceptance --verbose
     # debug section to check what went wrong
     - sudo apt-get install curl
     - curl http://admin:admin@localhost/owncloud/index.php
-- 
cgit v1.2.3