Commit be98070a authored by anonym's avatar anonym
Browse files

Test suite: rename step.

The current name is completely wrong -- the menu navigation was
completely broken due to #11718 and it was thought we would be able to
fix it and revert the GNOME Activities workaround, and just skip the
renaming since the workaround was temporary. Well, it seems that the
menu handling still is not reliable, even with #11718 fixed, so let's
stick with what has worked pretty good during the feature/stretch
development.

Refs: #11718
parent 4306bb3c
...@@ -11,7 +11,7 @@ Feature: Chatting anonymously using Pidgin ...@@ -11,7 +11,7 @@ Feature: Chatting anonymously using Pidgin
@check_tor_leaks @fragile @check_tor_leaks @fragile
Scenario: Chatting with some friend over XMPP Scenario: Chatting with some friend over XMPP
Given I have started Tails from DVD and logged in and the network is connected Given I have started Tails from DVD and logged in and the network is connected
When I start "Pidgin Internet Messenger" via the GNOME "Internet" applications menu When I start "Pidgin Internet Messenger" via GNOME Activities Overview
Then I see Pidgin's account manager window Then I see Pidgin's account manager window
When I create my XMPP account When I create my XMPP account
And I close Pidgin's account manager window And I close Pidgin's account manager window
...@@ -25,7 +25,7 @@ Feature: Chatting anonymously using Pidgin ...@@ -25,7 +25,7 @@ Feature: Chatting anonymously using Pidgin
@check_tor_leaks @fragile @check_tor_leaks @fragile
Scenario: Chatting with some friend over XMPP in a multi-user chat Scenario: Chatting with some friend over XMPP in a multi-user chat
Given I have started Tails from DVD and logged in and the network is connected Given I have started Tails from DVD and logged in and the network is connected
When I start "Pidgin Internet Messenger" via the GNOME "Internet" applications menu When I start "Pidgin Internet Messenger" via GNOME Activities Overview
Then I see Pidgin's account manager window Then I see Pidgin's account manager window
When I create my XMPP account When I create my XMPP account
And I close Pidgin's account manager window And I close Pidgin's account manager window
...@@ -46,7 +46,7 @@ Feature: Chatting anonymously using Pidgin ...@@ -46,7 +46,7 @@ Feature: Chatting anonymously using Pidgin
@check_tor_leaks @fragile @check_tor_leaks @fragile
Scenario: Chatting with some friend over XMPP and with OTR Scenario: Chatting with some friend over XMPP and with OTR
Given I have started Tails from DVD and logged in and the network is connected Given I have started Tails from DVD and logged in and the network is connected
When I start "Pidgin Internet Messenger" via the GNOME "Internet" applications menu When I start "Pidgin Internet Messenger" via GNOME Activities Overview
Then I see Pidgin's account manager window Then I see Pidgin's account manager window
When I create my XMPP account When I create my XMPP account
And I close Pidgin's account manager window And I close Pidgin's account manager window
...@@ -64,7 +64,7 @@ Feature: Chatting anonymously using Pidgin ...@@ -64,7 +64,7 @@ Feature: Chatting anonymously using Pidgin
Scenario: Connecting to the tails multi-user chat with my XMPP account Scenario: Connecting to the tails multi-user chat with my XMPP account
Given I have started Tails from DVD and logged in and the network is connected Given I have started Tails from DVD and logged in and the network is connected
And Pidgin has the expected accounts configured with random nicknames And Pidgin has the expected accounts configured with random nicknames
When I start "Pidgin Internet Messenger" via the GNOME "Internet" applications menu When I start "Pidgin Internet Messenger" via GNOME Activities Overview
Then I see Pidgin's account manager window Then I see Pidgin's account manager window
And I create my XMPP account And I create my XMPP account
And I close Pidgin's account manager window And I close Pidgin's account manager window
...@@ -73,14 +73,14 @@ Feature: Chatting anonymously using Pidgin ...@@ -73,14 +73,14 @@ Feature: Chatting anonymously using Pidgin
Scenario: Adding a certificate to Pidgin Scenario: Adding a certificate to Pidgin
Given I have started Tails from DVD and logged in and the network is connected Given I have started Tails from DVD and logged in and the network is connected
And I start "Pidgin Internet Messenger" via the GNOME "Internet" applications menu And I start "Pidgin Internet Messenger" via GNOME Activities Overview
And I see Pidgin's account manager window And I see Pidgin's account manager window
And I close Pidgin's account manager window And I close Pidgin's account manager window
Then I can add a certificate from the "/home/amnesia" directory to Pidgin Then I can add a certificate from the "/home/amnesia" directory to Pidgin
Scenario: Failing to add a certificate to Pidgin Scenario: Failing to add a certificate to Pidgin
Given I have started Tails from DVD and logged in and the network is connected Given I have started Tails from DVD and logged in and the network is connected
When I start "Pidgin Internet Messenger" via the GNOME "Internet" applications menu When I start "Pidgin Internet Messenger" via GNOME Activities Overview
And I see Pidgin's account manager window And I see Pidgin's account manager window
And I close Pidgin's account manager window And I close Pidgin's account manager window
Then I cannot add a certificate from the "/home/amnesia/.gnupg" directory to Pidgin Then I cannot add a certificate from the "/home/amnesia/.gnupg" directory to Pidgin
...@@ -100,7 +100,7 @@ Feature: Chatting anonymously using Pidgin ...@@ -100,7 +100,7 @@ Feature: Chatting anonymously using Pidgin
And Tor is ready And Tor is ready
And available upgrades have been checked And available upgrades have been checked
And all notifications have disappeared And all notifications have disappeared
When I start "Pidgin Internet Messenger" via the GNOME "Internet" applications menu When I start "Pidgin Internet Messenger" via GNOME Activities Overview
Then I see Pidgin's account manager window Then I see Pidgin's account manager window
When I create my XMPP account When I create my XMPP account
And I close Pidgin's account manager window And I close Pidgin's account manager window
...@@ -114,7 +114,7 @@ Feature: Chatting anonymously using Pidgin ...@@ -114,7 +114,7 @@ Feature: Chatting anonymously using Pidgin
And I start Tails from USB drive "__internal" and I login with persistence enabled And I start Tails from USB drive "__internal" and I login with persistence enabled
And Pidgin has the expected persistent accounts configured And Pidgin has the expected persistent accounts configured
# And Pidgin has the expected persistent OTR keys # And Pidgin has the expected persistent OTR keys
When I start "Pidgin Internet Messenger" via the GNOME "Internet" applications menu When I start "Pidgin Internet Messenger" via GNOME Activities Overview
Then Pidgin automatically enables my XMPP account Then Pidgin automatically enables my XMPP account
And I join some empty multi-user chat And I join some empty multi-user chat
# Exercise Pidgin AppArmor profile with persistence enabled. # Exercise Pidgin AppArmor profile with persistence enabled.
......
...@@ -66,7 +66,7 @@ Then /^I install "(.+)" using apt$/ do |package_name| ...@@ -66,7 +66,7 @@ Then /^I install "(.+)" using apt$/ do |package_name|
end end
When /^I start Synaptic$/ do When /^I start Synaptic$/ do
step 'I start "Synaptic Package Manager" via the GNOME "System Tools" applications menu' step 'I start "Synaptic Package Manager" via GNOME Activities Overview'
deal_with_polkit_prompt(@sudo_password) deal_with_polkit_prompt(@sudo_password)
@synaptic = Dogtail::Application.new('synaptic') @synaptic = Dogtail::Application.new('synaptic')
# The seemingly spurious space is needed because that is how this # The seemingly spurious space is needed because that is how this
......
...@@ -3,7 +3,7 @@ Then /^the Unsafe Browser has started$/ do ...@@ -3,7 +3,7 @@ Then /^the Unsafe Browser has started$/ do
end end
When /^I start the Unsafe Browser(?: through the GNOME menu)?$/ do When /^I start the Unsafe Browser(?: through the GNOME menu)?$/ do
step "I start \"Unsafe Browser\" via the GNOME \"Internet\" applications menu" step "I start \"Unsafe Browser\" via GNOME Activities Overview"
end end
When /^I successfully start the Unsafe Browser$/ do When /^I successfully start the Unsafe Browser$/ do
......
...@@ -364,7 +364,7 @@ Given /^available upgrades have been checked$/ do ...@@ -364,7 +364,7 @@ Given /^available upgrades have been checked$/ do
end end
When /^I start the Tor Browser( in offline mode)?$/ do |offline| When /^I start the Tor Browser( in offline mode)?$/ do |offline|
step 'I start "Tor Browser" via the GNOME "Internet" applications menu' step 'I start "Tor Browser" via GNOME Activities Overview'
if offline if offline
offline_prompt = Dogtail::Application.new('zenity') offline_prompt = Dogtail::Application.new('zenity')
.dialog('Tor is not ready') .dialog('Tor is not ready')
...@@ -580,7 +580,7 @@ Given /^I switch to the "([^"]+)" NetworkManager connection$/ do |con_name| ...@@ -580,7 +580,7 @@ Given /^I switch to the "([^"]+)" NetworkManager connection$/ do |con_name|
end end
When /^I start and focus GNOME Terminal$/ do When /^I start and focus GNOME Terminal$/ do
step 'I start "GNOME Terminal" via the GNOME "Utilities" applications menu' step 'I start "GNOME Terminal" via GNOME Activities Overview'
@screen.wait('GnomeTerminalWindow.png', 40) @screen.wait('GnomeTerminalWindow.png', 40)
end end
...@@ -636,9 +636,7 @@ Then /^persistence for "([^"]+)" is (|not )enabled$/ do |app, enabled| ...@@ -636,9 +636,7 @@ Then /^persistence for "([^"]+)" is (|not )enabled$/ do |app, enabled|
end end
end end
Given /^I start "([^"]+)" via the GNOME "([^"]+)" applications menu$/ do |app_name, submenu| Given /^I start "([^"]+)" via GNOME Activities Overview$/ do |app_name|
# XXX: Dogtail is buggy when interacting with the Applications menu
# (see #11718) so we use the GNOME Applications Overview instead.
@screen.wait('GnomeApplicationsMenu.png', 10) @screen.wait('GnomeApplicationsMenu.png', 10)
$vm.execute_successfully('xdotool key Super', user: LIVE_USER) $vm.execute_successfully('xdotool key Super', user: LIVE_USER)
@screen.wait('GnomeActivitiesOverview.png', 10) @screen.wait('GnomeActivitiesOverview.png', 10)
......
Then /^I start Electrum through the GNOME menu$/ do Then /^I start Electrum through the GNOME menu$/ do
step "I start \"Electrum Bitcoin Wallet\" via the GNOME \"Internet\" applications menu" step "I start \"Electrum Bitcoin Wallet\" via GNOME Activities Overview"
end end
When /^a bitcoin wallet is (|not )present$/ do |existing| When /^a bitcoin wallet is (|not )present$/ do |existing|
......
...@@ -32,7 +32,7 @@ EOF ...@@ -32,7 +32,7 @@ EOF
end end
When /^I type a message into gedit$/ do When /^I type a message into gedit$/ do
step 'I start "gedit" via the GNOME "Accessories" applications menu' step 'I start "gedit" via GNOME Activities Overview'
@screen.wait_and_click("GeditWindow.png", 20) @screen.wait_and_click("GeditWindow.png", 20)
# We don't have a good visual indicator for when we can continue. Without the # We don't have a good visual indicator for when we can continue. Without the
# sleep we may start typing in the gedit window far too soon, causing # sleep we may start typing in the gedit window far too soon, causing
......
...@@ -125,7 +125,7 @@ Then /^I connect to an SFTP server on the Internet$/ do ...@@ -125,7 +125,7 @@ Then /^I connect to an SFTP server on the Internet$/ do
end end
retry_tor(recovery_proc) do retry_tor(recovery_proc) do
step 'I start "Nautilus" via the GNOME "Accessories" applications menu' step 'I start "Nautilus" via GNOME Activities Overview'
nautilus = Dogtail::Application.new('nautilus') nautilus = Dogtail::Application.new('nautilus')
nautilus.child(roleName: 'frame') nautilus.child(roleName: 'frame')
nautilus.child('Other Locations', roleName: 'label').click nautilus.child('Other Locations', roleName: 'label').click
......
...@@ -31,7 +31,7 @@ When /^I start Thunderbird$/ do ...@@ -31,7 +31,7 @@ When /^I start Thunderbird$/ do
workaround_pref_lines.each do |line| workaround_pref_lines.each do |line|
$vm.file_append('/etc/thunderbird/pref/thunderbird.js ', line) $vm.file_append('/etc/thunderbird/pref/thunderbird.js ', line)
end end
step 'I start "Thunderbird" via the GNOME "Internet" applications menu' step 'I start "Thunderbird" via GNOME Activities Overview'
try_for(60) { thunderbird_main } try_for(60) { thunderbird_main }
end end
......
...@@ -22,7 +22,7 @@ def start_or_restart_seahorse ...@@ -22,7 +22,7 @@ def start_or_restart_seahorse
if @withgpgapplet if @withgpgapplet
seahorse_menu_click_helper('GpgAppletIconNormal.png', 'GpgAppletManageKeys.png') seahorse_menu_click_helper('GpgAppletIconNormal.png', 'GpgAppletManageKeys.png')
else else
step 'I start "Passwords and Keys" via the GNOME "Utilities" applications menu' step 'I start "Passwords and Keys" via GNOME Activities Overview'
end end
step 'Seahorse has opened' step 'Seahorse has opened'
end end
......
...@@ -211,7 +211,7 @@ Given /^I enable all persistence presets$/ do ...@@ -211,7 +211,7 @@ Given /^I enable all persistence presets$/ do
end end
When /^I disable the first persistence preset$/ do When /^I disable the first persistence preset$/ do
step 'I start "Configure persistent volume" via the GNOME "Tails" applications menu' step 'I start "Configure persistent volume" via GNOME Activities Overview'
@screen.wait('PersistenceWizardPresets.png', 300) @screen.wait('PersistenceWizardPresets.png', 300)
@screen.type(Sikuli::Key.SPACE) @screen.type(Sikuli::Key.SPACE)
@screen.wait_and_click('PersistenceWizardSave.png', 10) @screen.wait_and_click('PersistenceWizardSave.png', 10)
...@@ -220,7 +220,7 @@ When /^I disable the first persistence preset$/ do ...@@ -220,7 +220,7 @@ When /^I disable the first persistence preset$/ do
end end
Given /^I create a persistent partition$/ do Given /^I create a persistent partition$/ do
step 'I start "Configure persistent volume" via the GNOME "Tails" applications menu' step 'I start "Configure persistent volume" via GNOME Activities Overview'
@screen.wait('PersistenceWizardStart.png', 60) @screen.wait('PersistenceWizardStart.png', 60)
@screen.type(@persistence_password + "\t" + @persistence_password + Sikuli::Key.ENTER) @screen.type(@persistence_password + "\t" + @persistence_password + Sikuli::Key.ENTER)
@screen.wait('PersistenceWizardPresets.png', 300) @screen.wait('PersistenceWizardPresets.png', 300)
...@@ -624,7 +624,7 @@ Then /^only the expected files are present on the persistence partition on USB d ...@@ -624,7 +624,7 @@ Then /^only the expected files are present on the persistence partition on USB d
end end
When /^I delete the persistent partition$/ do When /^I delete the persistent partition$/ do
step 'I start "Delete persistent volume" via the GNOME "Tails" applications menu' step 'I start "Delete persistent volume" via GNOME Activities Overview'
@screen.wait("PersistenceWizardDeletionStart.png", 120) @screen.wait("PersistenceWizardDeletionStart.png", 120)
@screen.type(" ") @screen.type(" ")
@screen.wait("PersistenceWizardDone.png", 120) @screen.wait("PersistenceWizardDone.png", 120)
......
...@@ -32,7 +32,7 @@ Feature: Tor stream isolation is effective ...@@ -32,7 +32,7 @@ Feature: Tor stream isolation is effective
@fragile @fragile
Scenario: Gobby is using the default SocksPort Scenario: Gobby is using the default SocksPort
When I monitor the network connections of Gobby When I monitor the network connections of Gobby
And I start "Gobby" via the GNOME "Internet" applications menu And I start "Gobby" via GNOME Activities Overview
And I connect Gobby to "gobby.debian.org" And I connect Gobby to "gobby.debian.org"
Then I see that Gobby is properly stream isolated Then I see that Gobby is properly stream isolated
......
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