Merge pull request cozy#183 from frankrousseau/master

Improve header of the index page of the Cozy Proxy

.travis.yml

@@ -1,19 +1,29 @@
+sudo: false
 language: node_js
 matrix:
     fast_finish: true
     allow_failures:
-        - node_js: "0.12"
+        - node_js: 4
 branches:
   except:
     - demo
 node_js:
-    - "0.10"
-    - "0.12"
-services:
-    - couchdb
+    - 0.10
+    - 0.12
+    - 4
 env:
     global:
         - NODE_ENV=test
+services:
+    - couchdb
+cache:
+    directories:
+        - node_modules
+addons:
+    apt:
+        packages:
+            - netstat
+
 before_install:
     - git clone git://github.com/cozy/cozy-data-system.git
     - cd cozy-data-system
@@ -23,9 +33,16 @@ before_install:
     - NAME=data-system TOKEN=token forever start -o forever-ds.log build/server.js
     - ps aux | grep server.js
     - sleep 5
-    - cat forever-ds.log
-    - sudo netstat -plunt
     - curl http://localhost:9101/
     - cd ..
     - export NAME=proxy
     - export TOKEN=token
+
+after_failure:
+    - pwd
+    - ps aux | grep server.js
+    - netstat -lntp
+    - cat ~/cozy-data-system/forever-ds.log
+    - cat ~/cozy-proxy/forever-proxy.log
+    - curl http://localhost:9101/
+    - curl http://localhost:9104/

Cakefile

@@ -54,7 +54,6 @@ task 'tests', "Run tests #{taskDetails}", (opts) ->
         console.log stdout
         console.log stderr
         if err
-            err = err
             logger.error "Running mocha caught exception:\n" + err
             process.exit 1
         else

README.md

@@ -52,10 +52,12 @@ Each modification requires a new build, here is how to run a build:
 
 ![Build Status](https://travis-ci.org/cozy/cozy-proxy.png?branch=master)
 
-To run tests type the following command into the Cozy Home folder:
+To run tests, type the following command into the Cozy Proxy folder:
 
     cake tests
 
+Note: a running data-system is required for the tests.
+
 ## Icons
 
 by [iconmonstr](http://iconmonstr.com/)