Commit 9fb382a0 authored by Tails developers's avatar Tails developers
Browse files

Remove workaround for showing the TBB's menu bar (Closes #8028).

In the end it seems the TBB will keep on hiding the menu bar, so we
use the menu button instead.
parent 00fd45bf
......@@ -73,23 +73,13 @@ When /^I open the address "([^"]*)" in the Unsafe Browser$/ do |address|
@screen.type(address + Sikuli::Key.ENTER)
end
# Workaround until the TBB shows the menu bar by default
# https://lists.torproject.org/pipermail/tor-qa/2014-October/000478.html
def show_unsafe_browser_menu_bar
try_for(15, :msg => "Failed to show the menu bar") do
@screen.type("h", Sikuli::KeyModifier.ALT)
@screen.find('UnsafeBrowserEditMenu.png')
end
end
Then /^I cannot configure the Unsafe Browser to use any local proxies$/ do
next if @skip_steps_while_restoring_background
@screen.wait_and_click("UnsafeBrowserWindow.png", 10)
# First we open the proxy settings page to prepare it with the
# correct open tabs for the loop below.
show_unsafe_browser_menu_bar
@screen.hover('UnsafeBrowserEditMenu.png')
@screen.wait_and_click('UnsafeBrowserEditPreferences.png', 10)
@screen.click('UnsafeBrowserMenuButton.png')
@screen.wait_and_click('UnsafeBrowserPreferencesButton.png', 10)
@screen.wait('UnsafeBrowserPreferencesWindow.png', 10)
@screen.wait_and_click('UnsafeBrowserAdvancedSettings.png', 10)
@screen.wait_and_click('UnsafeBrowserNetworkTab.png', 10)
......@@ -119,9 +109,8 @@ Then /^I cannot configure the Unsafe Browser to use any local proxies$/ do
@screen.hide_cursor
# Open proxy settings and select manual proxy configuration
show_unsafe_browser_menu_bar
@screen.hover('UnsafeBrowserEditMenu.png')
@screen.wait_and_click('UnsafeBrowserEditPreferences.png', 10)
@screen.click('UnsafeBrowserMenuButton.png')
@screen.wait_and_click('UnsafeBrowserPreferencesButton.png', 10)
@screen.wait('UnsafeBrowserPreferencesWindow.png', 10)
@screen.type("e", Sikuli::KeyModifier.ALT)
@screen.wait('UnsafeBrowserProxySettings.png', 10)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment