#1221 add ui test for recipient deletion

FlowCrypt · Dec 27, 2021 · 8aeea42 · 8aeea42
1 parent 75d353e
commit 8aeea42
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/FlowCrypt/Controllers/Compose/ComposeViewController.swift b/FlowCrypt/Controllers/Compose/ComposeViewController.swift
@@ -887,7 +887,8 @@ extension ComposeViewController {
         guard selectedRecipients.isEmpty else {
             // remove selected recipients
             contextToSend.recipients = recipients.filter { !$0.state.isSelected }
-            node.reloadRows(at: [recipientsIndexPath], with: .fade)
+            node.reloadSections([Section.recipient.rawValue, Section.password.rawValue],
+                                with: .automatic)
             return
         }
 

diff --git a/FlowCrypt/Functionality/Services/Compose Message Service/ComposeMessageContext.swift b/FlowCrypt/Functionality/Services/Compose Message Service/ComposeMessageContext.swift
@@ -23,6 +23,21 @@ struct ComposeMessageContext: Equatable {
     private var _messagePassword: String?
 }
 
+extension ComposeMessageContext {
+    init(message: String? = nil,
+         recipients: [ComposeMessageRecipient] = [],
+         subject: String? = nil,
+         attachments: [MessageAttachment] = [],
+         messagePassword: String? = nil
+    ) {
+        self.message = message
+        self.recipients = recipients
+        self.subject = subject
+        self.attachments = attachments
+        self.messagePassword = messagePassword
+    }
+}
+
 extension ComposeMessageContext {
     var hasMessagePassword: Bool {
         messagePassword != nil

diff --git a/FlowCryptUI/Cell Nodes/RecipientEmailNode.swift b/FlowCryptUI/Cell Nodes/RecipientEmailNode.swift
@@ -57,8 +57,8 @@ final class RecipientEmailNode: CellNode {
                 break
             }
         }
-        imageNode.addTarget(self, action: #selector(handleTap(_:)), forControlEvents: .touchUpInside)
-        titleNode.addTarget(self, action: #selector(handleTap(_:)), forControlEvents: .touchUpInside)
+        imageNode.addTarget(self, action: #selector(handleTap), forControlEvents: .touchUpInside)
+        titleNode.addTarget(self, action: #selector(handleTap), forControlEvents: .touchUpInside)
     }
 
     @objc private func handleTap(_ sender: ASDisplayNode) {

diff --git a/appium/tests/screenobjects/new-message.screen.ts b/appium/tests/screenobjects/new-message.screen.ts
@@ -165,6 +165,12 @@ class NewMessageScreen extends BaseScreen {
     expect(name).toEqual(`  ${recipient}  `);
   }
 
+  deleteAddedRecipient = async (order: number, color: string) => {
+    const addedRecipientEl = await $(`~aid-to-${order}-${color}`);
+    await ElementHelper.waitAndClick(addedRecipientEl);
+    await driver.sendKeys(['\b']); // backspace
+  }
+
   checkAddedAttachment = async (name: string) => {
     await (await this.deleteAttachmentButton).waitForDisplayed();
     const label = await this.attachmentNameLabel;

diff --git a/appium/tests/specs/live/composeEmail/SendEmailToRecipientWithoutPublicKey.spec.ts b/appium/tests/specs/live/composeEmail/SendEmailToRecipientWithoutPublicKey.spec.ts
@@ -33,6 +33,14 @@ describe('COMPOSE EMAIL: ', () => {
     await NewMessageScreen.clickCancelButton();
     await NewMessageScreen.checkPasswordCell(emptyPasswordMessage);
 
+    await NewMessageScreen.deleteAddedRecipient(0, 'gray');
+
+    await NewMessageScreen.setAddRecipient(recipient);
+    await NewMessageScreen.clickSendButton();
+    await BaseScreen.checkModalMessage(passwordModalMessage);
+    await NewMessageScreen.clickCancelButton();
+    await NewMessageScreen.checkPasswordCell(emptyPasswordMessage);
+
     await NewMessageScreen.clickPasswordCell();
     await NewMessageScreen.setMessagePassword(emailPassword);
     await NewMessageScreen.checkPasswordCell(addedPasswordMessage);