Merge "Make more tests pass in sandbox.translatewiki.net"

tests/browser/features/step_definitions/panel_steps.rb

@@ -43,7 +43,13 @@ When(/^I select "(.*?)" font for the (.*?) language for the live preview$/) do |
 end
 
 When(/^I close the panel to discard the changes$/) do
-	on(ULSPage).panel_button_close_element.click
+	on(ULSPage) do |page|
+		page.panel_button_close_element.click
+		# Also close the ULS language selection if open
+		if uls_position() == 'personal'
+			page.uls_button_close_element.when_visible.click
+		end
+	end
 end
 
 Then(/^the active (.*?) font must be the same as font prior to the preview$/) do |type|

tests/browser/features/step_definitions/uls_triggers_steps.rb

@@ -2,6 +2,6 @@ When(/^I click language selector trigger element$/) do
 	on(RandomPage).uls_trigger
 end
 
-Then(/^I should see the Language selector$/) do
-	on(RandomPage).language_settings_dialog_element.should be_visible
+Then(/^I should see the language selector$/) do
+	on(ULSPage).uls_element.should be_visible
 end