summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-08-29 06:59:45 +0200
committeranonym <anonym@riseup.net>2016-08-29 06:59:45 +0200
commitbd3f499e31612405793e13c5e9430c8824f70188 (patch)
tree4deedb3e4303d601ae112bc6be4e162c51ebe798
parent7ca33346177a344e003491ad1a8dd2f39c044ff5 (diff)
parented0d3a6b5249f21accdae5c17f321029f35a8478 (diff)
Merge remote-tracking branch 'origin/feature/stretch' into feature/stretch
-rw-r--r--features/gnome.feature6
-rw-r--r--features/images/TailsGreeterDisableAllNetworking.pngbin2099 -> 2035 bytes
-rw-r--r--features/images/TailsGreeterLanguage.pngbin1103 -> 610 bytes
-rw-r--r--features/images/TailsGreeterLanguageGerman.pngbin985 -> 764 bytes
-rw-r--r--features/images/TailsGreeterLoginButtonGerman.pngbin1031 -> 1121 bytes
-rw-r--r--features/step_definitions/gnome.rb8
6 files changed, 7 insertions, 7 deletions
diff --git a/features/gnome.feature b/features/gnome.feature
index a0c4124..a267d42 100644
--- a/features/gnome.feature
+++ b/features/gnome.feature
@@ -3,11 +3,11 @@ 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 Pictures directory
+ And there is no screenshot in the live user's home directory
When I press the "PRINTSCREEN" key
- Then a screenshot is saved to the live user's Pictures directory
+ Then a screenshot is saved to the live user's home directory
Scenario: GNOME notifications are shown to the user
Given I have started Tails from DVD without network and logged in
When the "Dogtail rules!" notification is sent
- Then the "Dogtail rules!" notification is shown to the user \ No newline at end of file
+ Then the "Dogtail rules!" notification is shown to the user
diff --git a/features/images/TailsGreeterDisableAllNetworking.png b/features/images/TailsGreeterDisableAllNetworking.png
index 066598d..1395afd 100644
--- a/features/images/TailsGreeterDisableAllNetworking.png
+++ b/features/images/TailsGreeterDisableAllNetworking.png
Binary files differ
diff --git a/features/images/TailsGreeterLanguage.png b/features/images/TailsGreeterLanguage.png
index 145373d..537a7d6 100644
--- a/features/images/TailsGreeterLanguage.png
+++ b/features/images/TailsGreeterLanguage.png
Binary files differ
diff --git a/features/images/TailsGreeterLanguageGerman.png b/features/images/TailsGreeterLanguageGerman.png
index 29f1fe3..b25ab64 100644
--- a/features/images/TailsGreeterLanguageGerman.png
+++ b/features/images/TailsGreeterLanguageGerman.png
Binary files differ
diff --git a/features/images/TailsGreeterLoginButtonGerman.png b/features/images/TailsGreeterLoginButtonGerman.png
index 52083bc..119f126 100644
--- a/features/images/TailsGreeterLoginButtonGerman.png
+++ b/features/images/TailsGreeterLoginButtonGerman.png
Binary files differ
diff --git a/features/step_definitions/gnome.rb b/features/step_definitions/gnome.rb
index 6e40601..f304f63 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 Pictures directory$/ do
- pictures_directory = "/home/#{LIVE_USER}/Pictures"
+Then /^there is no screenshot in the live user's home directory$/ do
+ pictures_directory = "/home/#{LIVE_USER}"
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 Pictures directory$/ do
- pictures_directory = "/home/#{LIVE_USER}/Pictures"
+Then /^a screenshot is saved to the live user's home directory$/ do
+ pictures_directory = "/home/#{LIVE_USER}"
try_for(10, :msg=> "No screenshot was created in #{pictures_directory}") do
!$vm.execute(
"find '#{pictures_directory}' -name 'Screenshot*.png' -maxdepth 1"