From c9b21d87f11d65a314f8e1429de6adc78fbc7aa7 Mon Sep 17 00:00:00 2001
From: Florian BLOUET <florian.blouet@gmail.com>
Date: Fri, 18 Mar 2016 12:36:38 +0100
Subject: [PATCH] update travis and circleci conf

---
 .travis.yml | 1 +
 circle.yml  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c1e8fb7de..4baff61a94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,6 +59,7 @@ before_script:
   - "./bin/developer phraseanet:generate-js-fixtures"
 
 script:
+  - "./node_modules/.bin/gulp test"
   - |
     echo "$TEST_SUITE";
     case "$TEST_SUITE" in
diff --git a/circle.yml b/circle.yml
index 112204549b..88a3c58bb7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,7 +9,7 @@ machine:
   php:
     version: 5.5.21
   node:
-    version: 0.12.0
+    version: stable
   services:
     - memcached
     - redis
@@ -46,5 +46,5 @@ database:
 
 test:
   override:
-    - case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; ./node_modules/.bin/gulp test || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac:
+    - case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac:
         parallel: true