Merge branch 'release/1.2.81'

2 files changed, 36 insertions, 6 deletions

diff --git a/tests/frontend/specs/keystroke_chat.js b/tests/frontend/specs/keystroke_chat.js
index 060c5aa2..e4908728 100644
--- a/tests/frontend/specs/keystroke_chat.js
+++ b/tests/frontend/specs/keystroke_chat.js
@@ -30,8 +30,9 @@ describe("send chat message", function(){
       var usernameValue = username.text();
       var time = $firstChatMessage.children(".time");
       var timeValue = time.text();
-      var expectedStringIncludingUserNameAndTime = usernameValue + timeValue + " " + "JohnMcLear";
-      expect(expectedStringIncludingUserNameAndTime).to.be($firstChatMessage.text());
+      var discoveredValue = $firstChatMessage.text();
+      var chatMsgExists = (discoveredValue.indexOf("JohnMcLear") !== -1);
+      expect(chatMsgExists).to.be(true);
       done();
     });
 
@@ -61,6 +62,7 @@ describe("send chat message", function(){
       expect(containsMessage).to.be(true);
       done();
     });
-
   });
+
 });
+
diff --git a/tests/frontend/specs/language.js b/tests/frontend/specs/language.js
index 86d2d740..ab7f2b3d 100644
--- a/tests/frontend/specs/language.js
+++ b/tests/frontend/specs/language.js
@@ -93,8 +93,9 @@ describe("Language select and change", function(){
  
     //select arabic
     $languageoption.attr('selected','selected');
-    $language.change();
- 
+    $language.val("ar");
+    $languageoption.change();
+
     helper.waitFor(function() { 
       return chrome$("html")[0]["dir"] != 'ltr';
      })
@@ -104,5 +105,32 @@ describe("Language select and change", function(){
       done();
     });
   });
- 
+
+  it("changes direction when picking an ltr lang", 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 english
+    //select arabic
+    $languageoption.attr('selected','selected');
+    $language.val("en");
+    $languageoption.change();
+
+    helper.waitFor(function() {
+      return chrome$("html")[0]["dir"] != 'rtl';
+     })
+    .done(function(){
+      // check if the document's direction was changed
+      expect(chrome$("html")[0]["dir"]).to.be("ltr");
+      done();
+    });
+  });
 });