Commit cb9c18c9 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/testing' into test/9087-lan-ssh-tests

parents 9dfaa0b5 45de9cf1
features/images/GpgAppletIconNormal.png

655 Bytes | W: | H:

features/images/GpgAppletIconNormal.png

585 Bytes | W: | H:

features/images/GpgAppletIconNormal.png
features/images/GpgAppletIconNormal.png
features/images/GpgAppletIconNormal.png
features/images/GpgAppletIconNormal.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -15,8 +15,9 @@ def check_for_seahorse_error
end
end
def start_or_restart_seahorse(withapplet = false)
if withapplet
def start_or_restart_seahorse
assert_not_nil(@withgpgapplet)
if @withgpgapplet
seahorse_menu_click_helper('GpgAppletIconNormal.png', 'GpgAppletManageKeys.png')
else
step 'I start "Seahorse" via the GNOME "Utilities" applications menu'
......@@ -87,7 +88,8 @@ When /^the "([^"]+)" key is in the live user's public keyring(?: after at most (
end
When /^I start Seahorse( via the Tails OpenPGP Applet)?$/ do |withgpgapplet|
start_or_restart_seahorse(withgpgapplet)
@withgpgapplet = !!withgpgapplet
start_or_restart_seahorse
end
Then /^Seahorse has opened$/ do
......@@ -117,7 +119,7 @@ Then /^I synchronize keys in Seahorse$/ do
if @screen.exists('GnomeCloseButton.png') || !$vm.has_process?('seahorse')
step 'I kill the process "seahorse"' if $vm.has_process?('seahorse')
debug_log('Restarting Seahorse.')
start_or_restart_seahorse(withgpgapplet)
start_or_restart_seahorse
end
end
......@@ -150,7 +152,7 @@ Then /^I synchronize keys in Seahorse$/ do
end
When /^I fetch the "([^"]+)" OpenPGP key using Seahorse( via the Tails OpenPGP Applet)?$/ do |keyid, withgpgapplet|
start_or_restart_seahorse(withgpgapplet)
step "I start Seahorse#{withgpgapplet}"
def change_of_status?(keyid)
# Due to a lack of visual feedback in Seahorse we'll break out of the
......
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