Merge "Fixes to failing tests"

tests/browser/features/font_selection.feature

@@ -13,7 +13,7 @@ Feature: Font selection
     Given I am logged in
       And I set "German" as the interface language
       And I open ULS
-      And I open display settings
+      And I open Display panel of language settings
     When I open Fonts panel of language settings
 
   Scenario: Font selector appears
@@ -32,7 +32,7 @@ Feature: Font selection
       And I close the panel to discard the changes
     Then the active interface font must be the same as font prior to the preview
       # System is the default value for English and German
-      And the selected interface font must be "Systemschriftart"
+      And the selected interface font must be Systemschriftart
 
   Scenario: Applying the live preview of interface font
     When I select OpenDyslexic font for the interface language for the live preview

tests/browser/features/step_definitions/font_selection_steps.rb

@@ -2,10 +2,6 @@ Given(/^I open ULS$/) do
 	on(PanelPage).trigger_personal_element.when_visible.click
 end
 
-Given(/^I open display settings$/) do
-	on(PanelPage).panel_display_element.when_visible.click
-end
-
 Then(/^the active content font must be the same as font prior to the preview$/) do
 	pending('bug #56081') do
 		on(PanelPage).content_font.should == @original_content_font
@@ -17,17 +13,11 @@ Then(/^the active interface font must be the same as font prior to the preview$/
 end
 
 Then(/^the selected content font must be "(.*?)"$/) do |font|
-	step 'I open display settings'
+	step 'I open Display panel of language settings'
 	step 'I open Fonts panel of language settings'
 	on(PanelPage).selected_content_font.should == font
 end
 
-Then(/^the selected interface font must be "(.*?)"$/) do |font|
-	step 'I open display settings'
-	step 'I open Fonts panel of language settings'
-	on(PanelPage).selected_interface_font.should == font
-end
-
 Then(/^the interface font must be changed to the "(.*?)" font$/) do |font|
 	on(PanelPage).interface_font.should match("^#{font}")
 end

tests/browser/features/step_definitions/panel_steps.rb

@@ -3,7 +3,9 @@ Then(/^I see "(.*?)" as the name of the content language$/) do |text|
 end
 
 When(/^I open the Universal Language Selector$/) do
-	on(PanelPage).trigger_personal_element.when_visible.click
+	on(PanelPage) do |page|
+		page.trigger_personal_element.when_visible.click unless page.uls_element.visible?
+	end
 end
 
 When(/^I open Display panel of language settings$/) do
@@ -19,7 +21,7 @@ When(/^I open Fonts panel of language settings$/) do
 end
 
 When(/^I select (.*?) font for the interface language for the live preview$/) do |font|
-	on(PanelPage).font_for_interface = font
+	on(PanelPage).selected_interface_font = font
 end
 
 When(/^I select (.*?) font for the content language for the live preview$/) do |font|

tests/browser/features/step_definitions/persistent_settings_steps.rb

@@ -2,7 +2,7 @@ Then(/^the selected interface font must be (.*?)$/) do |font|
 	step 'I open the Universal Language Selector'
 	step 'I open Display panel of language settings'
 	step 'I open Fonts panel of language settings'
-	on(PanelPage).font_for_interface.should == font
+	on(PanelPage).selected_interface_font.should == font
 end
 
 Then(/^the selected input method for Malayalam is ml-inscript2$/) do

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

@@ -40,7 +40,6 @@ class PanelPage
 	select(:selected_content_font, id: 'content-font-selector')
 	select(:selected_interface_font, id: 'ui-font-selector')
 
-	select(:font_for_interface, id: 'ui-font-selector')
 	select(:font_for_content, id: 'content-font-selector')
 
 	div(:uls_display_settings, class: 'uls-display-settings')

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

@@ -11,7 +11,7 @@ class RandomPage
   a(:download_as_pdf, text: 'Download as PDF')
   a(:download_the_file, text: 'Download the file')
   li(:main_page, id: 'n-mainpage-description')
-  a(:malayalam_link, text: 'മലയാളം')
+  a(:malayalam_link, title: 'Malayalam')
   a(:print_export, text: 'Print/export')
   a(:printable_version, text: 'Printable version')
   button(:search_button, id: 'searchButton')