summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2018-11-08 09:06:07 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2018-11-08 09:06:07 +0100
commitf8dce38cd913ce771c1aea1c76408ac9671aef7a (patch)
tree4fbb364ac4c79634d71dfb0e6266dcb584d743b2
parent22722ad0fa13a3867026000d22a65d64f1ade227 (diff)
Test suite: Fix non-caprturing regexp handling in some steps.
Bug introduced with 710d832fddfe42b79cafa8c65d12b115a0cdb0bd Refs: #14596
-rw-r--r--features/step_definitions/additional_software_packages.rb2
-rw-r--r--features/step_definitions/common_steps.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/features/step_definitions/additional_software_packages.rb b/features/step_definitions/additional_software_packages.rb
index d22b5ad..b8d2786 100644
--- a/features/step_definitions/additional_software_packages.rb
+++ b/features/step_definitions/additional_software_packages.rb
@@ -63,7 +63,7 @@ Then /^"([^"]*)" is not in the list of Additional Software$/ do |package|
end
end
-When /^I (refuse|accept) (adding|removing) "([^"]*)" (?:to|from) Additional Software$/ do |decision, action, package, destination|
+When /^I (refuse|accept) (adding|removing) "([^"]*)" (?:to|from) Additional Software$/ do |decision, action, package|
gnome_shell = Dogtail::Application.new('gnome-shell')
case action
when "adding"
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index da8f708..1e57d26 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -138,7 +138,7 @@ Given /^I start Tails( from DVD)?( with network unplugged)?( and genuine APT sou
end
end
-Given /^I start Tails from (.+?) drive "(.+?)"( with network unplugged)?( and I login( with persistence enabled)?( (?:and|with) an administration password)?)?$/ do |drive_type, drive_name, network_unplugged, do_login, persistence_on, and_or_with, admin_password|
+Given /^I start Tails from (.+?) drive "(.+?)"( with network unplugged)?( and I login( with persistence enabled)?( (?:and|with) an administration password)?)?$/ do |drive_type, drive_name, network_unplugged, do_login, persistence_on, admin_password|
step "the computer is set to boot from #{drive_type} drive \"#{drive_name}\""
if network_unplugged
step "the network is unplugged"