Merge pull request #15084 from bobsilverberg/kb_lang

Bug 957144 - OSX b2g desktop failure | test_settings_change_keyboard_language.py

tests/python/gaia-ui-tests/gaiatest/apps/keyboard/app.py

@@ -229,6 +229,7 @@ def switch_keyboard_language(self, lang_code):
 
     def tap_keyboard_language_key(self):
         self.switch_to_keyboard()
+        self.wait_for_element_displayed(*self._language_key_locator)
         self.marionette.find_element(*self._language_key_locator).tap()
         self.apps.switch_to_displayed_app()
 

tests/python/gaia-ui-tests/gaiatest/apps/settings/regions/keyboard.py

@@ -43,6 +43,7 @@ class KeyboardAddMoreKeyboards(Base):
         By.XPATH,
         "//div[@id='keyboardAppContainer']//li[label[span[text()='%s']]]"
     )
+    _back_button_locator = (By.CSS_SELECTOR, '.current header > a')
 
     def __init__(self, marionette):
         Base.__init__(self, marionette)
@@ -62,3 +63,6 @@ def select_language(self, language):
         selected_language.tap()
         checkbox = selected_language.find_element(By.TAG_NAME, 'input')
         self.wait_for_condition(lambda m: checkbox.is_selected())
+
+    def go_back(self):
+        self.marionette.find_element(*self._back_button_locator).tap()

tests/python/gaia-ui-tests/gaiatest/tests/functional/settings/test_settings_change_keyboard_language.py

@@ -25,8 +25,9 @@ def test_change_keyboard_language_settings(self):
         # Tap 'add more keyboards' button
         add_more_keyboards = select_keyboard.tap_add_more_keyboards()
 
-        # Select keyboard language
+        # Select keyboard language, then click back to make it "stick"
         add_more_keyboards.select_language(u'Espa\u00F1ol')
+        add_more_keyboards.go_back()
 
         # launch the Contacts app to verify the keyboard layout
         contacts_app = Contacts(self.marionette)