summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-12-22 19:44:39 +0000
committerintrigeri <intrigeri@boum.org>2016-12-22 19:44:39 +0000
commit0c947a7c2e389eaa412fddb3c81ef79f4ec7d101 (patch)
tree534a741aa7d19a80635916771a1a30507e75acf2
parentd264dbf10c1ad659ef8c0626b30382184deae1e0 (diff)
Revert "Test suite: update the screenshot scenario."
This reverts commit 1d9d5609056805d3d6c42bc04a753017e511f308. We've reintroduced the Pictures directory and friends.
-rw-r--r--features/gnome.feature4
-rw-r--r--features/step_definitions/gnome.rb8
2 files changed, 6 insertions, 6 deletions
diff --git a/features/gnome.feature b/features/gnome.feature
index a267d42..61cbaae 100644
--- a/features/gnome.feature
+++ b/features/gnome.feature
@@ -3,9 +3,9 @@ Feature: GNOME is well-integrated into Tails
Scenario: A screenshot is taken when the PRINTSCREEN key is pressed
Given I have started Tails from DVD without network and logged in
- And there is no screenshot in the live user's home directory
+ And there is no screenshot in the live user's Pictures directory
When I press the "PRINTSCREEN" key
- Then a screenshot is saved to the live user's home directory
+ Then a screenshot is saved to the live user's Pictures directory
Scenario: GNOME notifications are shown to the user
Given I have started Tails from DVD without network and logged in
diff --git a/features/step_definitions/gnome.rb b/features/step_definitions/gnome.rb
index f304f63..6e40601 100644
--- a/features/step_definitions/gnome.rb
+++ b/features/step_definitions/gnome.rb
@@ -1,13 +1,13 @@
-Then /^there is no screenshot in the live user's home directory$/ do
- pictures_directory = "/home/#{LIVE_USER}"
+Then /^there is no screenshot in the live user's Pictures directory$/ do
+ pictures_directory = "/home/#{LIVE_USER}/Pictures"
assert($vm.execute(
"find '#{pictures_directory}' -name 'Screenshot*.png' -maxdepth 1"
).stdout.empty?,
"Existing screenshots were found in the live user's Pictures directory.")
end
-Then /^a screenshot is saved to the live user's home directory$/ do
- pictures_directory = "/home/#{LIVE_USER}"
+Then /^a screenshot is saved to the live user's Pictures directory$/ do
+ pictures_directory = "/home/#{LIVE_USER}/Pictures"
try_for(10, :msg=> "No screenshot was created in #{pictures_directory}") do
!$vm.execute(
"find '#{pictures_directory}' -name 'Screenshot*.png' -maxdepth 1"