From d9fdbb35bc01ebee97a77979aa118dab397b78f8 Mon Sep 17 00:00:00 2001 From: Jakub Cuth Date: Wed, 17 Apr 2024 15:08:48 +0200 Subject: [PATCH] fix(GODT-3185): logic mistake. --- internal/services/imapservice/connector.go | 2 +- tests/features/imap/message/create.feature | 2 +- tests/features/imap/message/drafts.feature | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/services/imapservice/connector.go b/internal/services/imapservice/connector.go index 3a2fa0f8..70a64079 100644 --- a/internal/services/imapservice/connector.go +++ b/internal/services/imapservice/connector.go @@ -885,7 +885,7 @@ func (s *Connector) reportGODT3185(isDraft bool, defaultAddr string, p *parser.P } reportMode := "combined" - if isCombinedMode { + if !isCombinedMode { reportMode = "split" } diff --git a/tests/features/imap/message/create.feature b/tests/features/imap/message/create.feature index 3d7c96e0..d1f41c92 100644 --- a/tests/features/imap/message/create.feature +++ b/tests/features/imap/message/create.feature @@ -57,7 +57,7 @@ Feature: IMAP create messages And IMAP client "1" eventually sees the following messages in "All Mail": | from | to | subject | body | | [alias:alias]@[domain] | john.doe@email.com | foo | bar | - And bridge reports a message with "GODT-3185: import with non-default address in split mode: using sender address" + And bridge reports a message with "GODT-3185: import with non-default address in combined mode: using sender address" Scenario: Imports an unrelated message to inbox When IMAP client "1" appends the following messages to "INBOX": diff --git a/tests/features/imap/message/drafts.feature b/tests/features/imap/message/drafts.feature index ac7f3329..f97c1945 100644 --- a/tests/features/imap/message/drafts.feature +++ b/tests/features/imap/message/drafts.feature @@ -164,7 +164,7 @@ Feature: IMAP Draft messages And IMAP client "1" eventually sees the following messages in "Drafts": | to | subject | body | | someone@example.com | Draft without From | This is a Draft without From in header | - And bridge reports a message with "GODT-3185: draft with non-default invalid address in split mode: error import/draft" + And bridge reports a message with "GODT-3185: draft with non-default invalid address in combined mode: error import/draft" @regression Scenario: Only one draft in Drafts and All Mail after editing it locally multiple times