Merge "Regression test for bug 56913"

tests/browser/features/settings_panel.feature

@@ -73,3 +73,15 @@ Feature: Settings panel
       And I use the panel to change my interface language to "German"
       And I apply the changes
     Then my interface language is "German"
+
+  @commons.wikimedia.beta.wmflabs.org @login
+  Scenario: Regression test for bug 56913
+
+    Given I am logged in
+    When I open the Universal Language Selector
+      And I open Input panel of language settings
+      And I click the button with the ellipsis
+      And I use the panel to change my input language to "Finnish"
+      And I close the panel to discard the changes
+      And I open Input panel of language settings
+    Then I should see English as the selected input language

tests/browser/features/step_definitions/panel_steps.rb

@@ -53,7 +53,7 @@ Then(/^a font selector for content language appears$/) do
   on(PanelPage).panel_content_font_selector_element.should be_visible
 end
 
-When(/^I use the panel to change my interface language to "(.*?)"$/) do |language|
+When(/^I use the panel to change my (?:interface|input) language to "(.*?)"$/) do |language|
 	code = on(PanelPage).language_to_code(language)
 	on(IMEPage) do |page|
 		page.language_filter = code
@@ -77,3 +77,7 @@ end
 Then(/^the Interlanguage area should use Autonym font$/) do
 	on(InterlanguagePage).interlang_link_element.style("font-family").should == "'Autonym',sans-serif"
 end
+
+Then(/^I should see (.*) as the selected input language$/) do |language|
+	on(PanelPage).default_language_button_element.text.should == language
+end

tests/browser/features/support/pages/panel_page.rb

@@ -28,7 +28,7 @@ class PanelPage
 
 	# TODO: Rename to match convention
 	button(:other_language_button, class: 'button uls-language-button', index: 1)
-	button(:default_language_button, class: 'button uls-language-button down')
+	button(:default_language_button, css: '.uls-language-button.down')
 
 	# Triggers
 	span(:trigger_cog, class: 'uls-settings-trigger')