functional_tests: Reorder tests to disable apps after tests

To reduce memory/CPU requirement on the VM running the services for functional
tests. The following items are kept enabled as these are enabled by default in
FreedomBox.:

- NTP daemon

- Restricted console login

- Unattended upgrades

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>

functional_tests/features/bind.feature

@@ -28,11 +28,6 @@ Scenario: Enable bind application
   When I enable the bind application
   Then the bind service should be running
 
-Scenario: Disable bind application
-  Given the bind application is enabled
-  When I disable the bind application
-  Then the bind service should not be running
-
 Scenario: Set bind forwarders
   Given the bind application is enabled
   And bind forwarders are set to 1.1.1.1
@@ -61,3 +56,8 @@ Scenario: Backup and restore bind
   And I restore the bind app data backup
   Then bind forwarders should be 1.1.1.1
   And bind DNSSEC should be disabled
+
+Scenario: Disable bind application
+  Given the bind application is enabled
+  When I disable the bind application
+  Then the bind service should not be running

functional_tests/features/coquelicot.feature

@@ -28,11 +28,6 @@ Scenario: Enable coquelicot application
   When I enable the coquelicot application
   Then the coquelicot service should be running
 
-Scenario: Disable coquelicot application
-  Given the coquelicot application is enabled
-  When I disable the coquelicot application
-  Then the coquelicot service should not be running
-
 Scenario: Modify maximum upload size
   Given the coquelicot application is enabled
   When I modify the maximum file size of coquelicot to 256
@@ -70,3 +65,8 @@ Scenario: Backup and restore coquelicot
   And I should be able to login to coquelicot with password beforebackup123
   And the maximum file size of coquelicot should be 128
   And contents of downloaded sample file should be same as sample local file
+
+Scenario: Disable coquelicot application
+  Given the coquelicot application is enabled
+  When I disable the coquelicot application
+  Then the coquelicot service should not be running

functional_tests/features/date_and_time.feature

@@ -22,16 +22,16 @@ Feature: Date and Time
 Background:
   Given I'm a logged in user
 
-Scenario: Enable network time application
-  Given the network time application is disabled
-  When I enable the network time application
-  Then the network time service should be running
-
 Scenario: Disable network time application
   Given the network time application is enabled
   When I disable the network time application
   Then the network time service should not be running
 
+Scenario: Enable network time application
+  Given the network time application is disabled
+  When I enable the network time application
+  Then the network time service should be running
+
 Scenario: Set timezone
   When I set the time zone to Africa/Abidjan
   Then the time zone should be Africa/Abidjan

functional_tests/features/deluge.feature

@@ -28,11 +28,6 @@ Scenario: Enable deluge application
   When I enable the deluge application
   Then the deluge site should be available
 
-Scenario: Disable deluge application
-  Given the deluge application is enabled
-  When I disable the deluge application
-  Then the deluge site should not be available
-
 Scenario: Upload a torrent to deluge
   Given the deluge application is enabled
   When all torrents are removed from deluge
@@ -48,3 +43,8 @@ Scenario: Backup and restore deluge
   And I restore the deluge app data backup
   Then the deluge service should be running
   And there should be 1 torrents listed in deluge
+
+Scenario: Disable deluge application
+  Given the deluge application is enabled
+  When I disable the deluge application
+  Then the deluge site should not be available

functional_tests/features/ejabberd.feature

@@ -28,11 +28,6 @@ Scenario: Enable ejabberd application
   When I enable the ejabberd application
   Then the ejabberd service should be running
 
-Scenario: Disable ejabberd application
-  Given the ejabberd application is enabled
-  When I disable the ejabberd application
-  Then the ejabberd service should not be running
-
 Scenario: Enable message archive management
   Given the ejabberd application is enabled
   When I enable message archive management
@@ -50,3 +45,8 @@ Scenario: Backup and restore ejabberd
   And I delete the contact from my roster
   And I restore the ejabberd app data backup
   Then I should have a contact on my roster
+
+Scenario: Disable ejabberd application
+  Given the ejabberd application is enabled
+  When I disable the ejabberd application
+  Then the ejabberd service should not be running

functional_tests/features/ikiwiki.feature

@@ -28,11 +28,6 @@ Scenario: Enable wiki application
   When I enable the wiki application
   Then the wiki site should be available
 
-Scenario: Disable wiki application
-  Given the wiki application is enabled
-  When I disable the wiki application
-  Then the wiki site should not be available
-
 Scenario: Backup and restore wiki
   Given the wiki application is enabled
   When there is an ikiwiki wiki
@@ -40,3 +35,8 @@ Scenario: Backup and restore wiki
   And I delete the ikiwiki wiki
   And I restore the ikiwiki app data backup
   Then the ikiwiki wiki should be restored
+
+Scenario: Disable wiki application
+  Given the wiki application is enabled
+  When I disable the wiki application
+  Then the wiki site should not be available

functional_tests/features/mediawiki.feature

@@ -28,11 +28,6 @@ Scenario: Enable mediawiki application
   When I enable the mediawiki application
   Then the mediawiki site should be available
 
-Scenario: Disable mediawiki application
-  Given the mediawiki application is enabled
-  When I disable the mediawiki application
-  Then the mediawiki site should not be available
-
 Scenario: Enable public registrations
   Given the mediawiki application is enabled
   When I enable mediawiki public registrations
@@ -91,3 +86,8 @@ Scenario: Backup and restore mediawiki
   And I restore the mediawiki app data backup
   Then the mediawiki main page should be restored
   Then the mediawiki site should allow creating accounts
+
+Scenario: Disable mediawiki application
+  Given the mediawiki application is enabled
+  When I disable the mediawiki application
+  Then the mediawiki site should not be available

functional_tests/features/mumble.feature

@@ -28,11 +28,6 @@ Scenario: Enable mumble application
   When I enable the mumble application
   Then the mumble service should be running
 
-Scenario: Disable mumble application
-  Given the mumble application is enabled
-  When I disable the mumble application
-  Then the mumble service should not be running
-
 # TODO: Improve this to actually check that data such as rooms, identity or
 # certificates are restored.
 Scenario: Backup and restore mumble
@@ -40,3 +35,8 @@ Scenario: Backup and restore mumble
   When I create a backup of the mumble app data
   And I restore the mumble app data backup
   Then the mumble service should be running
+
+Scenario: Disable mumble application
+  Given the mumble application is enabled
+  When I disable the mumble application
+  Then the mumble service should not be running

functional_tests/features/pagekite.feature

@@ -28,11 +28,6 @@ Scenario: Enable pagekite application
   When I enable pagekite
   Then pagekite should be enabled
 
-Scenario: Disable pagekite application
-  Given pagekite is enabled
-  When I disable pagekite
-  Then pagekite should be disabled
-
 Scenario: Configure pagekite application
   Given pagekite is enabled
   When I configure pagekite with host pagekite.example.com, port 8080, kite name mykite.example.com and kite secret mysecret
@@ -46,3 +41,8 @@ Scenario: Backup and restore pagekite
   And I restore the pagekite app data backup
   Then pagekite should be enabled
   And pagekite should be configured with host beforebackup.example.com, port 8081, kite name beforebackup.example.com and kite secret beforebackupsecret
+
+Scenario: Disable pagekite application
+  Given pagekite is enabled
+  When I disable pagekite
+  Then pagekite should be disabled

functional_tests/features/privoxy.feature

@@ -28,13 +28,13 @@ Scenario: Enable privoxy application
   When I enable the privoxy application
   Then the privoxy service should be running
 
-Scenario: Disable privoxy application
-  Given the privoxy application is enabled
-  When I disable the privoxy application
-  Then the privoxy service should not be running
-
 Scenario: Backup and restore privoxy
   Given the privoxy application is enabled
   When I create a backup of the privoxy app data
   And I restore the privoxy app data backup
   Then the privoxy service should be running
+
+Scenario: Disable privoxy application
+  Given the privoxy application is enabled
+  When I disable the privoxy application
+  Then the privoxy service should not be running

functional_tests/features/quassel.feature

@@ -28,14 +28,14 @@ Scenario: Enable quassel application
   When I enable the quassel application
   Then the quassel service should be running
 
-Scenario: Disable quassel application
-  Given the quassel application is enabled
-  When I disable the quassel application
-  Then the quassel service should not be running
-
 # TODO: Improve this to actually check that data configured servers is restored.
 Scenario: Backup and restore quassel
   Given the quassel application is enabled
   When I create a backup of the quassel app data
   And I restore the quassel app data backup
   Then the quassel service should be running
+
+Scenario: Disable quassel application
+  Given the quassel application is enabled
+  When I disable the quassel application
+  Then the quassel service should not be running

functional_tests/features/radicale.feature

@@ -30,13 +30,6 @@ Scenario: Enable radicale application
   And the calendar should be available
   And the addressbook should be available
 
-Scenario: Disable radicale application
-  Given the radicale application is enabled
-  When I disable the radicale application
-  Then the radicale service should not be running
-  And the calendar should not be available
-  And the addressbook should not be available
-
 Scenario: Owner-only access rights
   Given the radicale application is enabled
   And the access rights are set to "any user can view, but only the owner can make changes"
@@ -57,3 +50,10 @@ Scenario: Authenticated access rights
   When I change the access rights to "any user can view or make changes"
   Then the radicale service should be running
   And the access rights should be "any user can view or make changes"
+
+Scenario: Disable radicale application
+  Given the radicale application is enabled
+  When I disable the radicale application
+  Then the radicale service should not be running
+  And the calendar should not be available
+  And the addressbook should not be available

functional_tests/features/repro.feature

@@ -29,11 +29,6 @@ Scenario: Enable repro application
   When I enable the repro application
   Then the repro service should be running
 
-Scenario: Disable repro application
-  Given the repro application is enabled
-  When I disable the repro application
-  Then the repro service should not be running
-
 Scenario: Backup and restore repro
   Given the repro application is enabled
   And repro has been configured
@@ -41,3 +36,8 @@ Scenario: Backup and restore repro
   And I delete the repro configuration
   And I restore the repro app data backup
   Then the repro configuration should be restored
+
+Scenario: Disable repro application
+  Given the repro application is enabled
+  When I disable the repro application
+  Then the repro service should not be running

functional_tests/features/roundcube.feature

@@ -28,13 +28,13 @@ Scenario: Enable roundcube application
   When I enable the roundcube application
   Then the roundcube site should be available
 
-Scenario: Disable roundcube application
-  Given the roundcube application is enabled
-  When I disable the roundcube application
-  Then the roundcube site should not be available
-
 Scenario: Backup and restore roundcube
   Given the roundcube application is enabled
   When I create a backup of the roundcube app data
   And I restore the roundcube app data backup
   Then the roundcube site should be available
+
+Scenario: Disable roundcube application
+  Given the roundcube application is enabled
+  When I disable the roundcube application
+  Then the roundcube site should not be available

functional_tests/features/searx.feature

@@ -28,13 +28,13 @@ Scenario: Enable searx application
   When I enable the searx application
   Then the searx site should be available
 
-Scenario: Disable searx application
-  Given the searx application is enabled
-  When I disable the searx application
-  Then the searx site should not be available
-
 Scenario: Backup and restore searx
   Given the searx application is enabled
   When I create a backup of the searx app data
   And I restore the searx app data backup
   Then the searx site should be available
+
+Scenario: Disable searx application
+  Given the searx application is enabled
+  When I disable the searx application
+  Then the searx site should not be available

functional_tests/features/security.feature

@@ -22,11 +22,6 @@ Feature: Security
 Background:
   Given I'm a logged in user
 
-Scenario: Enable restricted console logins
-  Given restricted console logins are disabled
-  When I enable restricted console logins
-  Then restricted console logins should be enabled
-
 Scenario: Disable restricted console logins
   Given restricted console logins are enabled
   When I disable restricted console logins
@@ -38,3 +33,8 @@ Scenario: Backup and restore security
   And I disable restricted console logins
   And I restore the security app data backup
   Then restricted console logins should be enabled
+
+Scenario: Enable restricted console logins
+  Given restricted console logins are disabled
+  When I enable restricted console logins
+  Then restricted console logins should be enabled

functional_tests/features/service_discovery.feature

@@ -22,12 +22,12 @@ Feature: Service Discovery
 Background:
   Given I'm a logged in user
 
-Scenario: Enable service discovery application
-  Given the service discovery application is disabled
-  When I enable the service discovery application
-  Then the service discovery service should be running
-
 Scenario: Disable service discovery application
   Given the service discovery application is enabled
   When I disable the service discovery application
   Then the service discovery service should not be running
+
+Scenario: Enable service discovery application
+  Given the service discovery application is disabled
+  When I enable the service discovery application
+  Then the service discovery service should be running

functional_tests/features/shadowsocks.feature

@@ -29,11 +29,6 @@ Scenario: Enable shadowsocks application
   When I enable the shadowsocks application
   Then the shadowsocks service should be running
 
-Scenario: Disable shadowsocks application
-  Given the shadowsocks application is enabled
-  When I disable the shadowsocks application
-  Then the shadowsocks service should not be running
-
 Scenario: Backup and restore shadowsocks
   Given the shadowsocks application is enabled
   When I configure shadowsocks with server example.com and password beforebackup123
@@ -42,3 +37,8 @@ Scenario: Backup and restore shadowsocks
   And I restore the shadowsocks app data backup
   Then the shadowsocks service should be running
   And shadowsocks should be configured with server example.com and password beforebackup123
+
+Scenario: Disable shadowsocks application
+  Given the shadowsocks application is enabled
+  When I disable the shadowsocks application
+  Then the shadowsocks service should not be running

functional_tests/features/transmission.feature

@@ -28,11 +28,6 @@ Scenario: Enable transmission application
   When I enable the transmission application
   Then the transmission site should be available
 
-Scenario: Disable transmission application
-  Given the transmission application is enabled
-  When I disable the transmission application
-  Then the transmission site should not be available
-
 Scenario: Upload a torrent to transmission
   Given the transmission application is enabled
   When all torrents are removed from transmission
@@ -48,3 +43,8 @@ Scenario: Backup and restore transmission
   And I restore the transmission app data backup
   Then the transmission service should be running
   And there should be 1 torrents listed in transmission
+
+Scenario: Disable transmission application
+  Given the transmission application is enabled
+  When I disable the transmission application
+  Then the transmission site should not be available

functional_tests/features/upgrades.feature

@@ -22,11 +22,6 @@ Feature: Software Upgrades
 Background:
   Given I'm a logged in user
 
-Scenario: Enable automatic upgrades
-  Given automatic upgrades are disabled
-  When I enable automatic upgrades
-  Then automatic upgrades should be enabled
-
 Scenario: Disable automatic upgrades
   Given automatic upgrades are enabled
   When I disable automatic upgrades
@@ -38,3 +33,8 @@ Scenario: Backup and restore upgrades
   And I disable automatic upgrades
   And I restore the upgrades app data backup
   Then automatic upgrades should be enabled
+
+Scenario: Enable automatic upgrades
+  Given automatic upgrades are disabled
+  When I enable automatic upgrades
+  Then automatic upgrades should be enabled