libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

tests: remove another setTimeout for Edge tests..

Browse source
This commit is contained in:
John McLear 2020-05-29 21:06:38 +01:00 committed by GitHub
parent cc606a24d7
commit 8c669682c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/frontend/specs/select_formatting_buttons.js
View file

@ -74,12 +74,12 @@ describe("select formatting buttons when selection has style applied", function(
}); });
// remove selection from previous line // remove selection from previous line
selectLine(line + 1); selectLine(line + 1);
setTimeout(function() { //setTimeout(function() {
// select the text or place the caret on a position that // select the text or place the caret on a position that
// has the formatting text applied previously // has the formatting text applied previously
selectTarget(line); selectTarget(line);
cb(); cb();
}, 1000); //}, 1000);
} }
var pressFormattingShortcutOnSelection = function(key) { var pressFormattingShortcutOnSelection = function(key) {

3
tests/frontend/travis/remote_runner.js
View file

@ -92,12 +92,15 @@ sauceTestWorker.push({
, 'browserName' : 'safari' , 'browserName' : 'safari'
, 'version' : 'latest' , 'version' : 'latest'
}); });
// IE 10 doesn't appear to be working anyway
/*
// 4) IE 10 on Win 8 // 4) IE 10 on Win 8
sauceTestWorker.push({ sauceTestWorker.push({
'platform' : 'Windows 8' 'platform' : 'Windows 8'
, 'browserName' : 'iexplore' , 'browserName' : 'iexplore'
, 'version' : '10.0' , 'version' : '10.0'
}); });
*/
// 5) Edge on Win 10 // 5) Edge on Win 10
sauceTestWorker.push({ sauceTestWorker.push({
'platform' : 'Windows 10' 'platform' : 'Windows 10'