mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-10-31 00:01:16 +01:00
Code Issues Projects Releases Wiki Activity

Increased timeouts to make IE9 happy, made button-test more strict

Browse Source
This commit is contained in:
mluto 2013-01-15 22:51:53 +01:00
parent 09fa1d49a1
commit ae07b73840
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/frontend/specs/chat_load_messages.js
View File

@ -14,7 +14,7 @@ describe("chat-load-messages", function(){
var chatInput = chrome$("#chatinput"); var chatInput = chrome$("#chatinput");
var chatText = chrome$("#chattext"); var chatText = chrome$("#chattext");
this.timeout(10000); this.timeout(60000);
var messages = 140; var messages = 140;
for(var i=1; i <= messages; i++) { for(var i=1; i <= messages; i++) {
@ -28,7 +28,7 @@ describe("chat-load-messages", function(){
} }
helper.waitFor(function(){ helper.waitFor(function(){
return chatText.children("p").length == messages; return chatText.children("p").length == messages;
}).always(function(){ }, 60000).always(function(){
expect(chatText.children("p").length).to.be(messages); expect(chatText.children("p").length).to.be(messages);
helper.newPad(done, padName); helper.newPad(done, padName);
}); });
@ -73,12 +73,15 @@ describe("chat-load-messages", function(){
chatButton.click(); chatButton.click();
var chatText = chrome$("#chattext"); var chatText = chrome$("#chattext");
var loadMsgBtn = chrome$("#chatloadmessagesbutton"); var loadMsgBtn = chrome$("#chatloadmessagesbutton");
var loadMsgBall = chrome$("#chatloadmessagesball");
loadMsgBtn.click(); loadMsgBtn.click();
helper.waitFor(function(){ helper.waitFor(function(){
return loadMsgBtn.css('display') == expectedDisplay; return loadMsgBtn.css('display') == expectedDisplay &&
loadMsgBall.css('display') == expectedDisplay;
}).always(function(){ }).always(function(){
expect(loadMsgBtn.css('display')).to.be(expectedDisplay); expect(loadMsgBtn.css('display')).to.be(expectedDisplay);
expect(loadMsgBall.css('display')).to.be(expectedDisplay);
done(); done();
}); });
}); });