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

Remove safari which is failing weirdly and fix race

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-06-01 00:50:36 +02:00
parent 92ab8d88ba
commit 50082cfd19
2 changed files with 2 additions and 1 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

1
TestSelenium.js
View File

@ -45,6 +45,7 @@ var nt = nThen;
var logMore = function () { var logMore = function () {
if (!done) { return; } if (!done) { return; }
driver.executeScript(SC_GET_DATA).then(waitFor(function (dataS) { driver.executeScript(SC_GET_DATA).then(waitFor(function (dataS) {
if (!done) { return; }
var data = JSON.parse(dataS); var data = JSON.parse(dataS);
data.forEach(function (d) { data.forEach(function (d) {
if (d.type !== 'log') { return; } if (d.type !== 'log') { return; }