fuwafuwa/etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Make language frontend test pass"

Browse Source 
Shouldn't have used setTimeout here...
This reverts commit ff0c9bb4a0c3c814c5f6373a38025b22fab26414.
This commit is contained in:
Marcel Klehr 2012-11-18 19:55:13 +01:00
parent a99ff139c9
commit f20af4818c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/frontend/specs/language.js
View File

@ -21,7 +21,13 @@ describe("Language select and change", function(){
$languageoption.attr('selected','selected'); $languageoption.attr('selected','selected');
$language.change(); $language.change();
setTimeout(function(){ helper.waitFor(function(){
var $boldButton = chrome$(".buttonicon-bold").parent();
//get the title of the bold button
var boldButtonTitle = $boldButton[0]["title"];
return boldButtonTitle !== undefined;
}).done(function(){
//get the value of the bold button //get the value of the bold button
var $boldButton = chrome$(".buttonicon-bold").parent(); var $boldButton = chrome$(".buttonicon-bold").parent();
@ -33,7 +39,7 @@ describe("Language select and change", function(){
expect(boldButtonTitle).to.be("Fett (Strg-B)"); expect(boldButtonTitle).to.be("Fett (Strg-B)");
done(); done();
}, 1000); });
}); });
it("makes text English", function(done) { it("makes text English", function(done) {
@ -52,7 +58,13 @@ describe("Language select and change", function(){
$languageoption.attr('selected','selected'); $languageoption.attr('selected','selected');
$language.change(); $language.change();
setTimeout(function(){ helper.waitFor(function(){
var $boldButton = chrome$(".buttonicon-bold").parent();
//get the title of the bold button
var boldButtonTitle = $boldButton[0]["title"];
return boldButtonTitle !== undefined;
}).done(function(){
//get the value of the bold button //get the value of the bold button
var $boldButton = chrome$(".buttonicon-bold").parent(); var $boldButton = chrome$(".buttonicon-bold").parent();
@ -64,7 +76,7 @@ describe("Language select and change", function(){
expect(boldButtonTitle).to.be("Bold (Ctrl-B)"); expect(boldButtonTitle).to.be("Bold (Ctrl-B)");
done(); done();
}, 1000); });
}); });
}); });