From d850faf6be2002d7763141fd036c5cb92a068320 Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 1 Apr 2025 10:15:28 +0700 Subject: [PATCH] Fix logic `forward_email` in E2E test to avoid build integration test on CI fail Signed-off-by: dab246 --- .../scenarios/forward_email_scenario.dart | 28 +++++++------------ .../eml/forward_email/{0.eml => forward.eml} | 18 ++++-------- provisioning/integration_test/provisioning.sh | 4 +-- 3 files changed, 17 insertions(+), 33 deletions(-) rename provisioning/integration_test/eml/forward_email/{0.eml => forward.eml} (70%) diff --git a/integration_test/scenarios/forward_email_scenario.dart b/integration_test/scenarios/forward_email_scenario.dart index 8e862dd85..cd3307055 100644 --- a/integration_test/scenarios/forward_email_scenario.dart +++ b/integration_test/scenarios/forward_email_scenario.dart @@ -4,7 +4,6 @@ import 'package:rich_text_composer/rich_text_composer.dart'; import 'package:tmail_ui_user/features/composer/presentation/composer_controller.dart'; import 'package:tmail_ui_user/features/composer/presentation/composer_view.dart'; import 'package:tmail_ui_user/features/composer/presentation/view/mobile/mobile_editor_view.dart'; -import 'package:tmail_ui_user/features/email/presentation/email_view.dart'; import 'package:tmail_ui_user/features/search/email/presentation/search_email_view.dart'; import '../base/base_test_scenario.dart'; @@ -19,25 +18,28 @@ class ForwardEmailScenario extends BaseTestScenario { @override Future runTestLogic() async { + const emailSubject = 'Forward email'; + final threadRobot = ThreadRobot($); + final searchRobot = SearchRobot($); + final emailRobot = EmailRobot($); + final composerRobot = ComposerRobot($); + await threadRobot.openSearchView(); await _expectSearchViewVisible(); - final searchRobot = SearchRobot($); - await searchRobot.enterQueryString('Forward email'); - await _expectSuggestionSearchListViewVisible(); + await searchRobot.enterQueryString(emailSubject); await searchRobot.tapOnShowAllResultsText(); await _expectSearchResultEmailListVisible(); - await searchRobot.openEmailWithSubject('Fwd: Forward email'); - await _expectEmailViewVisible(); + await $.pumpAndSettle(duration: const Duration(seconds: 2)); + + await searchRobot.openEmailWithSubject(emailSubject); await _expectForwardEmailButtonVisible(); - final emailRobot = EmailRobot($); await emailRobot.onTapForwardEmail(); await _expectComposerViewVisible(); - final composerRobot = ComposerRobot($); await composerRobot.grantContactPermission(); await _expectMobileEditorViewVisible(); @@ -48,22 +50,12 @@ class ForwardEmailScenario extends BaseTestScenario { await expectViewVisible($(SearchEmailView)); } - Future _expectSuggestionSearchListViewVisible() async { - await expectViewVisible($(#suggestion_search_list_view)); - } - Future _expectSearchResultEmailListVisible() async { await expectViewVisible($(#search_email_list_notification_listener)); - await $.pump(const Duration(seconds: 3)); - } - - Future _expectEmailViewVisible() async { - await expectViewVisible($(EmailView)); } Future _expectForwardEmailButtonVisible() async { await expectViewVisible($(#forward_email_button)); - await $.pump(const Duration(seconds: 3)); } Future _expectComposerViewVisible() async { diff --git a/provisioning/integration_test/eml/forward_email/0.eml b/provisioning/integration_test/eml/forward_email/forward.eml similarity index 70% rename from provisioning/integration_test/eml/forward_email/0.eml rename to provisioning/integration_test/eml/forward_email/forward.eml index 54646e17d..36797b37c 100644 --- a/provisioning/integration_test/eml/forward_email/0.eml +++ b/provisioning/integration_test/eml/forward_email/forward.eml @@ -1,12 +1,11 @@ Return-Path: MIME-Version: 1.0 References: -Subject: Fwd: Forward email to Bob +Subject: Forward email From: emma@example.com -To: "bob@example.com" -Cc: "alice@example.com" -Bcc: "brian@example.com" -Reply-To: emma@example.com +To: "bob" +Cc: "alice" +Bcc: "brian" Date: Tue, 17 Dec 2024 16:31:00 +0000 Message-ID: User-Agent: Twake-Mail/0.13.2 Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; @@ -20,7 +19,7 @@ Content-Transfer-Encoding: quoted-printable Accept-Language: fr-FR, en-US, vi-VN, ru-RU, ar-TN, it-IT Content-Language: en-US -Forward email to Bob +Forward email Invite you in to a meeting: Event OPEN TECH TALK: INNOVATION FOR THE TWAKE WORKPLACE @@ -32,11 +31,4 @@ Our 3rd Open Tech Talk in 2024! We are waiting for you! ----=Part.4f.450e1cfbcd355387.192d67ae03d.c367d8042fea24dd=- -Content-Type: text/html; charset=UTF-8 -Content-Transfer-Encoding: quoted-printable -Accept-Language: fr-FR, en-US, vi-VN, ru-RU, ar-TN, it-IT -Content-Language: en-US - - ---=Part.4f.450e1cfbcd355387.192d67ae03d.c367d8042fea24dd=--- diff --git a/provisioning/integration_test/provisioning.sh b/provisioning/integration_test/provisioning.sh index 4f25e09d5..001f5fc9d 100755 --- a/provisioning/integration_test/provisioning.sh +++ b/provisioning/integration_test/provisioning.sh @@ -50,8 +50,8 @@ done # For test forward email # Import emails into 'Forward Emails' folder for user Bob -echo "Importing 0.eml into 'Forward Emails' folder for user bob" -james-cli ImportEml \#private "bob@example.com" "Forward Emails" "/root/conf/integration_test/eml/forward_email/0.eml" +echo "Importing forward.eml into 'Forward Emails' folder for user bob" +james-cli ImportEml \#private "bob@example.com" "Forward Emails" "/root/conf/integration_test/eml/forward_email/forward.eml" # For test email with no-disposition inline image # Import email into 'Disposition' folder for user Bob