Add new snapshot for when having logged in with persistence enabled.

Most of the time when testing persistence, this is what we need so it
will save some time and make the scenarios simpler.

features/electrum.feature

@@ -11,10 +11,8 @@ Feature: Electrum Bitcoin client
     Then I see a warning that Electrum is not persistent
 
   Scenario: Using a persistent Electrum configuration
-    Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
+    Given Tails has booted without network from a USB drive with a persistent partition enbled and logged in
     And the network is plugged
-    When I enable persistence
-    And I log in to a new session
     And Tor is ready
     And available upgrades have been checked
     And all notifications have disappeared

features/evince.feature

@@ -41,10 +41,7 @@ Feature: Using Evince
     And AppArmor has denied "/usr/bin/evince" from opening "/lib/live/mount/overlay/home/amnesia/.gnupg/default-testpage.pdf"
 
   Scenario: I can view and print a PDF file stored in persistent /home/amnesia/Persistent but not /home/amnesia/.gnupg
-    Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
-    When I enable persistence
-    And I log in to a new session
-    And the Tails desktop is ready
+    Given Tails has booted without network from a USB drive with a persistent partition enbled and logged in
     And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia/Persistent" as user "amnesia"
     Then the file "/home/amnesia/Persistent/default-testpage.pdf" exists
     And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia/.gnupg" as user "amnesia"
@@ -56,9 +53,7 @@ Feature: Using Evince
     And I can print the current document to "/home/amnesia/Persistent/output.pdf"
 
   Scenario: I cannot view a PDF file stored in persistent /home/amnesia/.gnupg
-    Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
-    When I enable persistence
-    And I log in to a new session
+    Given Tails has booted without network from a USB drive with a persistent partition enbled and logged in
     Then the file "/home/amnesia/Persistent/default-testpage.pdf" exists
     Given I start monitoring the AppArmor log of "/usr/bin/evince"
     And I try to open "/home/amnesia/.gnupg/default-testpage.pdf" with Evince

features/persistence.feature

@@ -12,26 +12,15 @@ Feature: Tails persistence
     But a Tails persistence partition exists on USB drive "current"
 
   Scenario: Booting Tails from a USB drive with an enabled persistent partition
-    Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
-    When I enable persistence
-    And I log in to a new session
-    Then Tails seems to have booted normally
+    Given Tails has booted without network from a USB drive with a persistent partition enbled and logged in
     And Tails is running from USB drive "current"
     And all persistence presets are enabled
     And all persistent directories have safe access rights
 
   Scenario: Writing files first to a read/write-enabled persistent partition, and then to a read-only-enabled persistent partition
-    Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
-    When I enable persistence
-    And I log in to a new session
-    Then Tails is running from USB drive "current"
-    And the boot device has safe access rights
-    And all persistence presets are enabled
-    And I write some files expected to persist
-    And all persistent filesystems have safe access rights
-    And all persistence configuration files have safe access rights
-    And all persistent directories have safe access rights
+    Given Tails has booted without network from a USB drive with a persistent partition enbled and logged in
     And I take note of which persistence presets are available
+    When I write some files expected to persist
     And I shutdown Tails and wait for the computer to power off
     # XXX: how does guestfs work vs snapshots?
     Then only the expected files are present on the persistence partition on USB drive "current"

features/pidgin.feature

@@ -89,7 +89,7 @@ Feature: Chatting anonymously using Pidgin
 
   @check_tor_leaks
   Scenario: Using a persistent Pidgin configuration
-    Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
+    Given Tails has booted without network from a USB drive with a persistent partition enbled and logged in
     And the network is plugged
     And I enable persistence
     And I log in to a new session

features/step_definitions/snapshots.rb

@@ -85,6 +85,20 @@ def checkpoints
         'Tails is running from USB drive "current"',
       ],
     },
+
+    'usb-install-with-persistence-logged-in' => {
+      :description => "Tails has booted without network from a USB drive with a persistent partition enbled and logged in",
+      :parent_checkpoint => 'usb-install-with-persistence-tails-greeter',
+      :steps => [
+        'I enable persistence',
+        'I log in to a new session',
+        'the Tails desktop is ready',
+        'all persistence presets are enabled',
+        'all persistent filesystems have safe access rights',
+        'all persistence configuration files have safe access rights',
+        'all persistent directories have safe access rights',
+      ],
+    },
   }
 end
 

features/torified_browsing.feature

@@ -132,11 +132,8 @@ Feature: Browsing the web using the Tor Browser
     Then the Tor Browser has no plugins installed
 
   Scenario: The persistent Tor Browser directory is usable
-    Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
+    Given Tails has booted without network from a USB drive with a persistent partition enbled and logged in
     And the network is plugged
-    When I enable persistence
-    And I log in to a new session
-    And Tails is running from USB drive "current"
     And Tor is ready
     And available upgrades have been checked
     And all notifications have disappeared
@@ -150,13 +147,7 @@ Feature: Browsing the web using the Tor Browser
     And I can print the current page as "output.pdf" to the persistent Tor Browser directory
 
   Scenario: Persistent browser bookmarks
-    Given Tails has booted without network from a USB drive with a persistent partition and stopped at Tails Greeter's login screen
-    And Tails is running from USB drive "current"
-    And the boot device has safe access rights
-    And I enable persistence
-    And I log in to a new session
-    And the Tails desktop is ready
-    And all notifications have disappeared
+    Given Tails has booted without network from a USB drive with a persistent partition enbled and logged in
     And all persistence presets are enabled
     And all persistent filesystems have safe access rights
     And all persistence configuration files have safe access rights