Commit 9390f603 authored by anonym's avatar anonym
Browse files

Revert test suite adaptiations to the Tor Browser 5.0a4 fonts.

This reverts commits:
  * 2f02f5e3
  * 9fd0c9f8

In Tor Browser 5.0 final, the old fonts are back.
parent f5e39edf
features/images/I2P_router_console.png

2.74 KB | W: | H:

features/images/I2P_router_console.png

3.73 KB | W: | H:

features/images/I2P_router_console.png
features/images/I2P_router_console.png
features/images/I2P_router_console.png
features/images/I2P_router_console.png
  • 2-up
  • Swipe
  • Onion skin
features/images/OpenWithImportKey.png

2.41 KB | W: | H:

features/images/OpenWithImportKey.png

2.59 KB | W: | H:

features/images/OpenWithImportKey.png
features/images/OpenWithImportKey.png
features/images/OpenWithImportKey.png
features/images/OpenWithImportKey.png
  • 2-up
  • Swipe
  • Onion skin
features/images/TorBrowserOkButton.png

546 Bytes | W: | H:

features/images/TorBrowserOkButton.png

786 Bytes | W: | H:

features/images/TorBrowserOkButton.png
features/images/TorBrowserOkButton.png
features/images/TorBrowserOkButton.png
features/images/TorBrowserOkButton.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -159,23 +159,6 @@ Then /^I can start the Unsafe Browser again$/ do
step "I start the Unsafe Browser"
end
# Given the bundled, fixed-size fonts introduced in Tor Browser 5.0,
# the text in the preferences sometimes pushes certain elements we
# need outside of the visible part of the page. In those cases this
# workaround is useful.
def unsafe_browser_scroll_page_to_extreme_right
right = 'UnsafeBrowserScrollRightButton.png'
done = 'UnsafeBrowserScrollRightButtonDone.png'
cur = nil
while cur != done
cur, match = @screen.findAny([right, done])
@screen.click(match) if cur == right
@screen.hide_cursor
end
rescue FindFailed
# There's no scrollbar, so we must be done
end
Then /^I cannot configure the Unsafe Browser to use any local proxies$/ do
next if @skip_steps_while_restoring_background
socks_proxy = 'c' # Alt+c for socks proxy
......@@ -197,7 +180,6 @@ Then /^I cannot configure the Unsafe Browser to use any local proxies$/ do
hit, _ = @screen.waitAny(['UnsafeBrowserNetworkTabAlreadySelected.png',
'UnsafeBrowserNetworkTab.png'], 10)
@screen.click(hit) if hit == 'UnsafeBrowserNetworkTab.png'
unsafe_browser_scroll_page_to_extreme_right
@screen.wait_and_click('UnsafeBrowserNetworkTabSettingsButton.png', 10)
@screen.wait('UnsafeBrowserProxySettingsWindow.png', 10)
@screen.type("m", Sikuli::KeyModifier.ALT)
......@@ -226,7 +208,6 @@ Then /^the Unsafe Browser has no proxy configured$/ do
@screen.wait_and_click('UnsafeBrowserPreferencesButton.png', 10)
@screen.wait_and_click('UnsafeBrowserAdvancedSettingsButton.png', 10)
@screen.wait_and_click('UnsafeBrowserNetworkTab.png', 10)
unsafe_browser_scroll_page_to_extreme_right
@screen.wait_and_click('UnsafeBrowserNetworkTabSettingsButton.png', 10)
@screen.wait('UnsafeBrowserProxySettingsWindow.png', 10)
@screen.wait('UnsafeBrowserNoProxySelected.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