summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-12-22 20:38:10 +0000
committerintrigeri <intrigeri@boum.org>2016-12-22 20:38:10 +0000
commit91503cc7a1b4c32f9bdc1b7d63523ddadef1cdd5 (patch)
treef136517632e91aee4aeb5cb47af9f80af12b482c
parentf17f8c0f03d5e011e071b99ec99cd4d6c18964b5 (diff)
parentda934b8fc424990399058e369af33b95e59d13d4 (diff)
Merge branch 'feature/stretch' into feature/8230-greeter-revamp-phase1
-rw-r--r--features/gnome.feature4
-rw-r--r--features/images/UnsafeBrowserDNSError.pngbin4700 -> 4618 bytes
-rw-r--r--features/images/UnsafeBrowserProxySettingsOkButton.pngbin1032 -> 677 bytes
-rw-r--r--features/step_definitions/gnome.rb8
-rw-r--r--features/step_definitions/icedove.rb2
5 files changed, 7 insertions, 7 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/images/UnsafeBrowserDNSError.png b/features/images/UnsafeBrowserDNSError.png
index 6e8f900..233bc19 100644
--- a/features/images/UnsafeBrowserDNSError.png
+++ b/features/images/UnsafeBrowserDNSError.png
Binary files differ
diff --git a/features/images/UnsafeBrowserProxySettingsOkButton.png b/features/images/UnsafeBrowserProxySettingsOkButton.png
index 251ceb8..93840ce 100644
--- a/features/images/UnsafeBrowserProxySettingsOkButton.png
+++ b/features/images/UnsafeBrowserProxySettingsOkButton.png
Binary files differ
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"
diff --git a/features/step_definitions/icedove.rb b/features/step_definitions/icedove.rb
index 7e94716..f11e9bd 100644
--- a/features/step_definitions/icedove.rb
+++ b/features/step_definitions/icedove.rb
@@ -89,7 +89,7 @@ Then /^I see that Enigmail is configured to use the correct keyserver$/ do
keyservers = @enigmail_prefs.child(
'Specify your keyserver(s):', roleName: 'entry'
).text
- assert_equal('hkps://hkps.pool.sks-keyservers.net', keyservers)
+ assert_equal("hkps://#{CONFIGURED_KEYSERVER_HOSTNAME}", keyservers)
end
Then /^I see that Enigmail is configured to use the correct SOCKS proxy$/ do