summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-10-03 18:00:01 +0000
committerTails developers <amnesia@boum.org>2014-10-03 18:00:01 +0000
commit07af96ad34f0159320e59e1c7a1249b43708d11e (patch)
treec5bce3283fa36385ff7ef6a40aae46db6917f0ef
parent9896b180ff24987d3c8396a3cd7369532d64b6a9 (diff)
Merge Totem scenarios to avoid having to boot so many times without snapshots.
-rw-r--r--features/step_definitions/totem.rb4
-rw-r--r--features/totem.feature17
2 files changed, 9 insertions, 12 deletions
diff --git a/features/step_definitions/totem.rb b/features/step_definitions/totem.rb
index 5763914..02f5deb 100644
--- a/features/step_definitions/totem.rb
+++ b/features/step_definitions/totem.rb
@@ -43,3 +43,7 @@ When /^I(?:| try to) open "([^"]+)" with Totem$/ do |filename|
next if @skip_steps_while_restoring_background
step "I run \"totem #{filename}\" in GNOME Terminal"
end
+
+When /^I close Totem$/ do
+ step 'I kill the process "totem"'
+end
diff --git a/features/totem.feature b/features/totem.feature
index 856ed5b..6627853 100644
--- a/features/totem.feature
+++ b/features/totem.feature
@@ -11,31 +11,24 @@ Feature: Using Totem
Background:
Given I create sample videos
- Scenario: I can watch an MP4 video stored in non-persistent /home/amnesia
+ Scenario: Watching a MP4 video stored on the non-persistent filesystem
Given a computer
And I setup a filesystem share containing sample videos
And I start Tails from DVD with network unplugged and I login
And I copy the sample videos to "/home/amnesia" as user "amnesia"
When I open "/home/amnesia/video.mp4" with Totem
Then I see "SampleLocalMp4VideoFrame.png" after at most 10 seconds
-
- Scenario: I cannot watch an MP4 video stored in non-persistent /home/amnesia/.gnupg
- Given a computer
- And I setup a filesystem share containing sample videos
- And I start Tails from DVD with network unplugged and I login
+ Given I close Totem
And I copy the sample videos to "/home/amnesia/.gnupg" as user "amnesia"
When I try to open "/home/amnesia/.gnupg/video.mp4" with Totem
Then I see "TotemUnableToOpen.png" after at most 10 seconds
- Scenario: I can watch a WebM video over HTTPS on the command-line
+ Scenario: Watching a WebM video over HTTPS on and without the command-line
Given a computer
And I start Tails from DVD and I login
When I open "https://webm.html5.org/test.webm" with Totem
Then I see "SampleRemoteWebMVideoFrame.png" after at most 10 seconds
-
- Scenario: I can watch a WebM video over HTTPS without using the command-line
- Given a computer
- And I start Tails from DVD and I login
- When I start Totem through the GNOME menu
+ When I close Totem
+ And I start Totem through the GNOME menu
When I load the "https://webm.html5.org/test.webm" URL in Totem
Then I see "SampleRemoteWebMVideoFrame.png" after at most 10 seconds