Refactoring live preview

Change-Id: I351094b8d746d991b1f1d92f3dd097f092e3f0f5

tests/browser/features/step_definitions/cog_sidebar_user_steps.rb

@@ -31,14 +31,6 @@ When(/^I click Cancel$/) do
   on(PanelPage).panel_button_cancel_element.click
 end
 
-When(/^I click on the link to select Malayalam$/) do
-  on(RandomPage).malayalam_link
-end
-
-When(/^I click the button with the ellipsis$/) do
-  on(InterlanguagePage).ellipsis_button_element.click
-end
-
 When(/^I click the cog icon by Languages in the sidebar$/) do
   on(NoInterlanguagePage).cog_element.when_present.click
   # Wait for the panel to open
@@ -49,10 +41,6 @@ When(/^I click X$/) do
   on(InterlanguagePage).x_element.click
 end
 
-When(/^in the language filter I type (.+)$/) do |language_abbreviation|
-  on(IMEPage).language_filter=language_abbreviation
-end
-
 Then(/^I can navigate back to Input Settings$/) do
   on(InterlanguagePage) do |page|
     page.back_to_input

tests/browser/features/step_definitions/common_steps.rb

@@ -25,3 +25,11 @@ Then(/^my interface language is "(.*?)"$/) do |language|
 	code = on(PanelPage).language_to_code(language)
 	on(PanelPage).interface_element.attribute("lang").should == code
 end
+
+When(/^I click the button with the ellipsis$/) do
+	on(InterlanguagePage).ellipsis_button_element.click
+end
+
+When(/^in the language filter I type (.+)$/) do |language_abbreviation|
+	on(IMEPage).language_filter = language_abbreviation
+end

tests/browser/features/step_definitions/live_preview_of_display_language_steps.rb

@@ -2,7 +2,7 @@ When(/^I set English font to System$/) do
 	on(PanelPage).select_font_for_content = "System font"
 end
 
-And(/^I set English font to OpenDyslexic$/) do
+When(/^I set English font to OpenDyslexic$/) do
 	on(PanelPage).select_font_for_content = "OpenDyslexic"
 end
 
@@ -10,12 +10,12 @@ Then(/^the selected content font must be OpenDyslexic$/) do
 	on(PanelPage).select_font_for_content.should == "OpenDyslexic"
 end
 
-And(/^I select a language different than English for display language$/) do
+Given(/^I select a language different than English for display language$/) do
 	on(PanelPage).other_language_button_element.click
 end
 
-And(/^I click on the link to select Hindi$/) do
-	on(InterlanguagePage).hindi_link_element.click
+When(/^I click on the link to select Malayalam$/) do
+	on(RandomPage).malayalam_element.click
 end
 
 Then(/^I should see the text in the language panel in (.+?)$/) do |language|