Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

.travis.yml

@@ -5,7 +5,7 @@ env:
     - "BROWSER='chrome::Windows 10'"
     - "BROWSER='MicrosoftEdge:14.14393:Windows 10'"
     - "BROWSER='internet explorer:11.103:Windows 10'"
-    #- "BROWSER='safari:10.0:macOS 10.12'"
+    - "BROWSER='safari:10.0:macOS 10.12'"
 branches:
   only:
     - master

TestSelenium.js

@@ -35,7 +35,6 @@ var nt = nThen;
     nt = nt(function (waitFor) {
         var done = waitFor();
         console.log('\n\n-----TEST ' + url + ' -----');
-        driver.get(url);
         var waitTo = setTimeout(function () {
             console.log("no report in 20 seconds, timing out");
             failed = true;
@@ -69,7 +68,7 @@ var nt = nThen;
                 if (done) { setTimeout(logMore, 50); }
             }));
         };
-        logMore();
+        driver.get(url).then(waitFor(logMore));
     }).nThen;
 });