Commit ed475f9a authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/feature/8548-tor-browser-5.0' into testing

Fix-committed: #8548
parents f6d1ec20 9390f603
......@@ -159,23 +159,6 @@ Then /^I can start the Unsafe Browser again$/ do
step "I start the Unsafe Browser"
# 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]) if cur == right
rescue FindFailed
# There's no scrollbar, so we must be done
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) if hit == 'UnsafeBrowserNetworkTab.png'
@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)
@screen.wait_and_click('UnsafeBrowserNetworkTabSettingsButton.png', 10)
@screen.wait('UnsafeBrowserProxySettingsWindow.png', 10)
@screen.wait('UnsafeBrowserNoProxySelected.png', 10)
......@@ -56,7 +56,7 @@ Fetch the version's hash file and its detached signature, and verify
with GnuPG:
wget ${DIST_URL}/sha256sums-unsigned-build.txt{.asc,} && \
gpg --verify sha256sums-unsigned-build.txt.{asc,}
gpg --verify sha256sums-unsigned-build.txt{.asc,}
Filter the tarballs we want and make them available at build time,
when the tarballs are fetched:
Supports Markdown
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