1 files changed, 18 insertions, 5 deletions

diff --git a/.travis.yml b/.travis.yml
index 53cf9bb5..c343d5ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,9 @@ cache:
     directories:
         - vendor
         - $HOME/.composer/cache
+        - node_modules
+        - $HOME/.cache/bower
+        - $HOME/.npm
 
 php:
     - 5.5
@@ -23,10 +26,13 @@ php:
     - 7.1
     - nightly
 
+node_js:
+    - "5"
+
 env:
-    - DB=mysql
-    - DB=pgsql
-    - DB=sqlite
+    - DB=mysql ASSETS=nobuild
+    - DB=pgsql ASSETS=nobuild
+    - DB=sqlite ASSETS=nobuild
 
 matrix:
     fast_finish: true
@@ -51,7 +57,9 @@ matrix:
           group: edge
           env: DB=sqlite
         - php: 7.0
-          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
+          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild
+        - php: 7.0
+          env: DB=sqlite ASSETS=build
     allow_failures:
         - php: hhvm-3.12
         - php: 7.1
@@ -67,14 +75,19 @@ before_script:
     - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
     # xdebug isn't enable for PHP 7.1
     - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
+    - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi;
     - composer self-update --no-progress
     - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
 
+install:
+    - if [[ $ASSETS != nobuild ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
+    - if [[ $ASSETS != nobuild ]]; then npm install -g npm@latest; fi;
+
 before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait composer install --no-interaction --no-progress --prefer-dist -o
+    - travis_wait bash install.sh
     - ant prepare-$DB
     - phpunit -v
     - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;