From 122093904fb536b6fc4f1ee5c0ac726d176c8f1a Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 21 Nov 2012 18:14:05 +0000
Subject: [PATCH] Actually fix the language tests...

---
 tests/frontend/specs/language.js | 42 +++++++++++++++-----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/tests/frontend/specs/language.js b/tests/frontend/specs/language.js
index f93bc33d3..87d04220c 100644
--- a/tests/frontend/specs/language.js
+++ b/tests/frontend/specs/language.js
@@ -4,69 +4,67 @@ describe("Language select and change", function(){
     helper.newPad(cb);
     this.timeout(60000);
   });
-
+ 
   it("makes text german", function(done) {
     var inner$ = helper.padInner$;
     var chrome$ = helper.padChrome$;
-
+ 
     //click on the settings button to make settings visible
     var $settingsButton = chrome$(".buttonicon-settings");
     $settingsButton.click();
-
+ 
     //click the language button
     var $language = chrome$("#languagemenu");
     var $languageoption = $language.find("[value=de]");
-
+ 
     //select german
     $languageoption.attr('selected','selected');
     $language.change();
-
-    var current = $language.val();
-    helper.waitFor(function() { return $language.val() != current})  // GOT IT?
+ 
+    helper.waitFor(function() { return $language.val() == "de"})
     .done(function(){
       //get the value of the bold button
       var $boldButton = chrome$(".buttonicon-bold").parent();
-
+ 
       //get the title of the bold button
       var boldButtonTitle = $boldButton[0]["title"];
-
+ 
       //check if the language is now german
       expect(boldButtonTitle).to.be("Fett (Strg-B)");
       done();
     });
   });
-
+ 
   it("makes text English", function(done) {
     var inner$ = helper.padInner$;
     var chrome$ = helper.padChrome$;
-
+ 
     //click on the settings button to make settings visible
     var $settingsButton = chrome$(".buttonicon-settings");
     $settingsButton.click();
-
+ 
     //click the language button
     var $language = chrome$("#languagemenu");
     var $languageoption = $language.find("[value=en]");
-
+ 
     //select german
     $languageoption.attr('selected','selected');
     $language.change();
-
-    var current = $language.val();
-    helper.waitFor(function() { return $language.val() != current})
+ 
+    helper.waitFor(function() { return $language.val() == "en";})
     .done(function(){
-
+ 
       //get the value of the bold button
       var $boldButton = chrome$(".buttonicon-bold").parent();
-
+ 
       //get the title of the bold button
       var boldButtonTitle = $boldButton[0]["title"];
-
+ 
       //check if the language is now English
       expect(boldButtonTitle).to.be("Bold (Ctrl-B)");
       done();
-
+ 
     });
   });
-
-});
+ 
+});
\ No newline at end of file