Merge "Make tests pass in phantomjs"

tests/browser/features/step_definitions/panel_steps.rb

@@ -22,18 +22,19 @@ When(/^I open "(.*?)" panel of language settings$/) do |panel|
 	@browser.execute_script(
 		"jQuery( '.uls-trigger, .uls-settings-trigger' ).eq( 0 ).click()"
 	)
+
 	on(ULSPage) do |page|
 		case panel
 		when "Display"
-			page.panel_display_element.click
+			page.panel_display_element.when_visible.click
 		when "Language"
-			page.panel_display_element.click
+			page.panel_display_element.when_visible.click
 			page.panel_language_element.click
 		when "Fonts"
-			page.panel_display_element.click
+			page.panel_display_element.when_visible.click
 			page.panel_fonts_element.click
 		when "Input"
-			page.panel_input_element.click
+			page.panel_input_element.when_visible.click
 		else
 			pending
 		end

tests/browser/features/step_definitions/uls_cog_sidebar_user_steps.rb

@@ -45,6 +45,8 @@ 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
+  on(ULSPage).panel_display_element.when_visible
 end
 
 When(/^I click X$/) do

tests/browser/features/step_definitions/uls_ime_steps.rb

@@ -47,7 +47,10 @@ When(/^I choose (.+?) as the input language$/) do |language|
   on(RandomPage) do |page|
     page.more_languages
     page.language_filter = language
-    page.language_filter_element.send_keys :return
+    # firefox only works with :return
+    # phantomjs only works with :enter
+    # This seems to work on both
+    page.language_filter_element.send_keys "\n"
   end
 end