web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
ansuz 2017-06-01 10:24:03 +02:00
commit 8a09083fd7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

3
TestSelenium.js
View File

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