Always run the 'the Tails desktop is ready' step.

... after logging in via Tails Greeter. Now we do some very important
stuff there, like enabling the accessibility toolkit in GNOME. That is
specifically something we lose if we forgot to run that step after
rebooting, which specifically was a problem in at least one scenario
(Deleting a Tails persistent partition).

While we're at it, let's also run the 'Tails Greeter has dealt with
the sudo password' step at the same time.

features/checks.feature

@@ -103,5 +103,4 @@ Feature: Various checks
     And I enable more Tails Greeter options
     And I disable all networking in the Tails Greeter
     And I log in to a new session
-    And the Tails desktop is ready
     Then no network interfaces are enabled

features/mac_spoofing.feature

@@ -15,7 +15,6 @@ Feature: Spoofing MAC addresses
     When I enable more Tails Greeter options
     And I disable MAC spoofing in Tails Greeter
     And I log in to a new session
-    And the Tails desktop is ready
     And Tor is ready
     Then 1 network interface is enabled
     And the network device has its default MAC address configured
@@ -24,7 +23,6 @@ Feature: Spoofing MAC addresses
   @fragile
   Scenario: MAC address spoofing is successful
     When I log in to a new session
-    And the Tails desktop is ready
     And Tor is ready
     Then 1 network interface is enabled
     And the network device has a spoofed MAC address configured
@@ -36,7 +34,6 @@ Feature: Spoofing MAC addresses
     Given macchanger will fail by not spoofing and always returns false
     When I log in to a new session
     And see the "Network card disabled" notification
-    And the Tails desktop is ready
     Then no network interfaces are enabled
     And the real MAC address was not leaked
 
@@ -46,7 +43,6 @@ Feature: Spoofing MAC addresses
     Given macchanger will fail by not spoofing and always returns true
     When I log in to a new session
     And see the "Network card disabled" notification
-    And the Tails desktop is ready
     Then no network interfaces are enabled
     And the real MAC address was not leaked
 
@@ -57,7 +53,6 @@ Feature: Spoofing MAC addresses
     And no network interface modules can be unloaded
     When I log in to a new session
     And see the "All networking disabled" notification
-    And the Tails desktop is ready
     Then 1 network interface is enabled
     But the MAC spoofing panic mode disabled networking
     And the real MAC address was not leaked

features/root_access_control.feature

@@ -12,7 +12,6 @@ Feature: Root access control enforcement
 
   Scenario: If no administrative password is set in Tails Greeter the live user should not be able to run arbitrary commands administrative privileges.
     Given I have started Tails from DVD without network and logged in
-    And Tails Greeter has dealt with the sudo password
     Then I should not be able to run administration commands as the live user with the "" password
     And I should not be able to run administration commands as the live user with the "amnesia" password
     And I should not be able to run administration commands as the live user with the "live" password

features/step_definitions/common_steps.rb

@@ -289,6 +289,8 @@ Given /^I log in to a new session(?: in )?(|German)$/ do |lang|
   else
     raise "Unsupported language: #{lang}"
   end
+  step 'Tails Greeter has dealt with the sudo password'
+  step 'the Tails desktop is ready'
 end
 
 Given /^I enable more Tails Greeter options$/ do

features/step_definitions/snapshots.rb

@@ -15,8 +15,6 @@ def checkpoints
       :parent_checkpoint => "tails-greeter",
       :steps => [
         'I log in to a new session',
-        'Tails Greeter has dealt with the sudo password',
-        'the Tails desktop is ready',
       ],
     },
 
@@ -29,7 +27,6 @@ def checkpoints
         'I start the computer',
         'the computer boots Tails',
         'I log in to a new session',
-        'the Tails desktop is ready',
       ],
     },
 
@@ -66,8 +63,6 @@ def checkpoints
         'I enable more Tails Greeter options',
         'I enable the specific Tor configuration option',
         'I log in to a new session',
-        'Tails Greeter has dealt with the sudo password',
-        'the Tails desktop is ready',
         'all notifications have disappeared',
       ],
     },
@@ -80,8 +75,6 @@ def checkpoints
         'I enable more Tails Greeter options',
         'I set an administration password',
         'I log in to a new session',
-        'Tails Greeter has dealt with the sudo password',
-        'the Tails desktop is ready',
       ],
     },
 
@@ -121,7 +114,6 @@ def checkpoints
       :parent_checkpoint => 'usb-install-tails-greeter',
       :steps => [
         'I log in to a new session',
-        'the Tails desktop is ready',
       ],
     },
 
@@ -146,7 +138,6 @@ def checkpoints
       :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',

features/torified_browsing.feature

@@ -166,7 +166,6 @@ Feature: Browsing the web using the Tor Browser
     And the computer reboots Tails
     And I enable read-only persistence
     And I log in to a new session
-    And the Tails desktop is ready
     And I start the Tor Browser in offline mode
     And the Tor Browser has started in offline mode
     Then the Tor Browser has a bookmark to eff.org

features/usb_upgrade.feature

@@ -56,7 +56,6 @@ Feature: Upgrading an old Tails USB installation
     And I start the computer
     When the computer boots Tails
     And I log in to a new session
-    And the Tails desktop is ready
     And all notifications have disappeared
     And I create a 4 GiB disk named "old"
     And I plug USB drive "old"