From ed05823c78ccaf5946739f02ccb36ad042078eea Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@proton.ch>
Date: Mon, 20 Mar 2023 13:19:05 +0100
Subject: [PATCH] fix(GODT-2418): Do not issue connector renames for inferiors

Bump Gluon (https://github.com/ProtonMail/gluon/pull/328) and add test.
---
 go.mod                                        |  2 +-
 go.sum                                        |  4 ++--
 .../imap/mailbox/rename_hiearchy.feature      | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 tests/features/imap/mailbox/rename_hiearchy.feature

diff --git a/go.mod b/go.mod
index 372279e7..1cc1c247 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557
 	github.com/Masterminds/semver/v3 v3.2.0
-	github.com/ProtonMail/gluon v0.15.1-0.20230317141727-9f7c827f39d2
+	github.com/ProtonMail/gluon v0.15.1-0.20230320120726-45de5f1292d7
 	github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a
 	github.com/ProtonMail/go-proton-api v0.4.1-0.20230314144605-dd633a1d4739
 	github.com/ProtonMail/gopenpgp/v2 v2.5.2
diff --git a/go.sum b/go.sum
index c024b799..b9071ed5 100644
--- a/go.sum
+++ b/go.sum
@@ -28,8 +28,8 @@ github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf h1:yc9daCCYUefEs
 github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf/go.mod h1:o0ESU9p83twszAU8LBeJKFAAMX14tISa0yk4Oo5TOqo=
 github.com/ProtonMail/docker-credential-helpers v1.1.0 h1:+kvUIpwWcbtP3WFv5sSvkFn/XLzSqPOB5AAthuk9xPk=
 github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod h1:mK0aBveCxhnQ756AmaTfXMZDeULvheYVhF/MWMErN5g=
-github.com/ProtonMail/gluon v0.15.1-0.20230317141727-9f7c827f39d2 h1:WT74oKGqW6gCvzXUvgTK4LarotUvyBz9YsNJqftAO74=
-github.com/ProtonMail/gluon v0.15.1-0.20230317141727-9f7c827f39d2/go.mod h1:yA4hk6CJw0BMo+YL8Y3ckCYs5L20sysu9xseshwY3QI=
+github.com/ProtonMail/gluon v0.15.1-0.20230320120726-45de5f1292d7 h1:IV5UN40uycUfexsuMOY1TAuGLVjKof6V2ybHsNPq1CM=
+github.com/ProtonMail/gluon v0.15.1-0.20230320120726-45de5f1292d7/go.mod h1:yA4hk6CJw0BMo+YL8Y3ckCYs5L20sysu9xseshwY3QI=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
diff --git a/tests/features/imap/mailbox/rename_hiearchy.feature b/tests/features/imap/mailbox/rename_hiearchy.feature
new file mode 100644
index 00000000..7bb0de8d
--- /dev/null
+++ b/tests/features/imap/mailbox/rename_hiearchy.feature
@@ -0,0 +1,19 @@
+Feature: IMAP get mailbox info
+  Background:
+    Given there exists an account with username "[user:user]" and password "password"
+    And the account "[user:user]" has the following custom mailboxes:
+      | name | type   |
+      | f1   | folder |
+      | f1/f2| folder |
+    And bridge starts
+    And the user logs in with username "[user:user]" and password "password"
+    And user "[user:user]" finishes syncing
+    And user "[user:user]" connects and authenticates IMAP client "1"
+
+  Scenario: Rename folder with subfolders
+    When IMAP client "1" renames "Folders/f1" to "Folders/f3"
+    And it succeeds
+    Then IMAP client "1" sees "Folders/f3"
+    Then IMAP client "1" sees "Folders/f3/f2"
+    And  IMAP client "1" does not see "Folders/f1"
+    And  IMAP client "1" does not see "Folders/f1/f2"