From d2b1b9d34c933efb367fef63a59af85bfe78a1eb Mon Sep 17 00:00:00 2001
From: James Houlahan <james.houlahan@proton.ch>
Date: Tue, 25 Oct 2022 00:16:24 +0200
Subject: [PATCH] Other: Rename BDD test action for hiding all mail

---
 tests/bdd_test.go                                 | 6 +++---
 tests/bridge_test.go                              | 4 ++--
 tests/features/imap/mailbox/hide_all_mail.feature | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/bdd_test.go b/tests/bdd_test.go
index 2623a6a0..a868f53b 100644
--- a/tests/bdd_test.go
+++ b/tests/bdd_test.go
@@ -87,6 +87,7 @@ func TestFeatures(testingT *testing.T) {
 			ctx.Step(`^the user agent is "([^"]*)"$`, s.theUserAgentIs)
 			ctx.Step(`^the header in the "([^"]*)" request to "([^"]*)" has "([^"]*)" set to "([^"]*)"$`, s.theHeaderInTheRequestToHasSetTo)
 			ctx.Step(`^the body in the "([^"]*)" request to "([^"]*)" is:$`, s.theBodyInTheRequestToIs)
+			ctx.Step(`^the API requires bridge version at least "([^"]*)"$`, s.theAPIRequiresBridgeVersion)
 
 			// ==== SETUP ====
 			ctx.Step(`^there exists an account with username "([^"]*)" and password "([^"]*)"$`, s.thereExistsAnAccountWithUsernameAndPassword)
@@ -103,7 +104,6 @@ func TestFeatures(testingT *testing.T) {
 			ctx.Step(`^bridge restarts$`, s.bridgeRestarts)
 			ctx.Step(`^bridge stops$`, s.bridgeStops)
 			ctx.Step(`^bridge is version "([^"]*)" and the latest available version is "([^"]*)" reachable from "([^"]*)"$`, s.bridgeVersionIsAndTheLatestAvailableVersionIsReachableFrom)
-			ctx.Step(`^the API requires bridge version at least "([^"]*)"$`, s.theAPIRequiresBridgeVersion)
 			ctx.Step(`^the user has disabled automatic updates$`, s.theUserHasDisabledAutomaticUpdates)
 			ctx.Step(`^the user changes the IMAP port to (\d+)$`, s.theUserChangesTheIMAPPortTo)
 			ctx.Step(`^the user changes the SMTP port to (\d+)$`, s.theUserChangesTheSMTPPortTo)
@@ -111,6 +111,8 @@ func TestFeatures(testingT *testing.T) {
 			ctx.Step(`^the user changes the gluon path$`, s.theUserChangesTheGluonPath)
 			ctx.Step(`^the user deletes the gluon files$`, s.theUserDeletesTheGluonFiles)
 			ctx.Step(`^the user reports a bug$`, s.theUserReportsABug)
+			ctx.Step(`^the user hides All Mail$`, s.theUserHidesAllMail)
+			ctx.Step(`^the user shows All Mail$`, s.theUserShowsAllMail)
 			ctx.Step(`^bridge sends a connection up event$`, s.bridgeSendsAConnectionUpEvent)
 			ctx.Step(`^bridge sends a connection down event$`, s.bridgeSendsAConnectionDownEvent)
 			ctx.Step(`^bridge sends a deauth event for user "([^"]*)"$`, s.bridgeSendsADeauthEventForUser)
@@ -122,8 +124,6 @@ func TestFeatures(testingT *testing.T) {
 			ctx.Step(`^bridge sends an update installed event for version "([^"]*)"$`, s.bridgeSendsAnUpdateInstalledEventForVersion)
 			ctx.Step(`^bridge sends an update not available event$`, s.bridgeSendsAnUpdateNotAvailableEvent)
 			ctx.Step(`^bridge sends a forced update event$`, s.bridgeSendsAForcedUpdateEvent)
-			ctx.Step(`^bridge hides all mail$`, s.bridgeHidesAllMail)
-			ctx.Step(`^bridge shows all mail$`, s.bridgeShowsAllMail)
 
 			// ==== USER ====
 			ctx.Step(`^the user logs in with username "([^"]*)" and password "([^"]*)"$`, s.userLogsInWithUsernameAndPassword)
diff --git a/tests/bridge_test.go b/tests/bridge_test.go
index 9820e37c..08b9c83e 100644
--- a/tests/bridge_test.go
+++ b/tests/bridge_test.go
@@ -263,10 +263,10 @@ func (s *scenario) bridgeSendsAForcedUpdateEvent() error {
 	return nil
 }
 
-func (s *scenario) bridgeHidesAllMail() error {
+func (s *scenario) theUserHidesAllMail() error {
 	return s.t.bridge.SetShowAllMail(false)
 }
 
-func (s *scenario) bridgeShowsAllMail() error {
+func (s *scenario) theUserShowsAllMail() error {
 	return s.t.bridge.SetShowAllMail(true)
 }
diff --git a/tests/features/imap/mailbox/hide_all_mail.feature b/tests/features/imap/mailbox/hide_all_mail.feature
index 2704b0cf..aaba42b6 100644
--- a/tests/features/imap/mailbox/hide_all_mail.feature
+++ b/tests/features/imap/mailbox/hide_all_mail.feature
@@ -19,7 +19,7 @@ Feature: IMAP Hide All Mail
       | All Mail      |
       | Folders       |
       | Labels        |
-    When bridge hides all mail
+    When the user hides All Mail
     Then IMAP client "1" sees the following mailbox info:
       | name          |
       | INBOX         |
@@ -31,7 +31,7 @@ Feature: IMAP Hide All Mail
       | Trash         |
       | Folders       |
       | Labels        |
-    When bridge shows all mail
+    When the user shows All Mail
     Then IMAP client "1" sees the following mailbox info:
       | name          |
       | INBOX         |