From 10ea59246fa248371753e31d8af8b3f07be789c8 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 4 Aug 2020 10:00:55 +1000
Subject: [PATCH] add back closed group tests
---
ts/test/session/integration/common.ts | 36 ++-----------------
.../session/integration/integration_itest.ts | 2 +-
.../page-objects/conversation.page.ts | 18 ++--------
3 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/ts/test/session/integration/common.ts b/ts/test/session/integration/common.ts
index e7a71b9ad..3edd13594 100644
--- a/ts/test/session/integration/common.ts
+++ b/ts/test/session/integration/common.ts
@@ -276,7 +276,6 @@ export class Common {
/** add each other as friends */
const textMessage = Common.generateSendMessageText();
-
await app1.client.element(ConversationPage.contactsButtonSection).click();
await app1.client.element(ConversationPage.addContactButton).click();
@@ -287,50 +286,21 @@ export class Common {
);
await app1.client.element(ConversationPage.nextButton).click();
await app1.client.waitForExist(
- ConversationPage.sendFriendRequestTextarea,
+ ConversationPage.sendMessageTextareaAndMessage,
1000
);
// send a text message to that user (will be a friend request)
await Common.setValueWrapper(
app1,
- ConversationPage.sendFriendRequestTextarea,
+ ConversationPage.sendMessageTextareaAndMessage,
textMessage
);
await app1.client.keys('Enter');
await app1.client.waitForExist(
- ConversationPage.existingFriendRequestText(textMessage),
+ ConversationPage.existingSendMessageText(textMessage),
1000
);
-
- // wait for left notification Friend Request count to go to 1 and click it
- await app2.client.waitForExist(
- ConversationPage.oneNotificationFriendRequestLeft,
- 5000
- );
- await app2.client
- .element(ConversationPage.oneNotificationFriendRequestLeft)
- .click();
- // open the dropdown from the top friend request count
- await app2.client.isExisting(
- ConversationPage.oneNotificationFriendRequestTop
- ).should.eventually.be.true;
- await app2.client
- .element(ConversationPage.oneNotificationFriendRequestTop)
- .click();
-
- // accept the friend request and validate that on both side the "accepted FR" message is shown
- await app2.client
- .element(ConversationPage.acceptFriendRequestButton)
- .click();
- await app2.client.waitForExist(
- ConversationPage.acceptedFriendRequestMessage,
- 1000
- );
- await app1.client.waitForExist(
- ConversationPage.acceptedFriendRequestMessage,
- 5000
- );
}
public static async startAppsAsFriends() {
diff --git a/ts/test/session/integration/integration_itest.ts b/ts/test/session/integration/integration_itest.ts
index aa37c6577..427988278 100644
--- a/ts/test/session/integration/integration_itest.ts
+++ b/ts/test/session/integration/integration_itest.ts
@@ -6,7 +6,7 @@ import './registration_itest';
import './open_group_itest';
import './add_contacts_itest';
import './link_device_itest';
-// import './closed_group_itest';
+import './closed_group_itest';
// import './message_functions_itest';
// import './settings_itest';
// import'./message_sync_itest';
diff --git a/ts/test/session/integration/page-objects/conversation.page.ts b/ts/test/session/integration/page-objects/conversation.page.ts
index 07c891e71..91408f8fc 100644
--- a/ts/test/session/integration/page-objects/conversation.page.ts
+++ b/ts/test/session/integration/page-objects/conversation.page.ts
@@ -5,13 +5,11 @@ export = {
sessionLoader: commonPage.divWithClass('session-loader'),
leftPaneOverlay: commonPage.divWithClass('module-left-pane-overlay'),
sendMessageTextarea: commonPage.textAreaWithClass('send-message'),
- sendFriendRequestTextarea: commonPage.textAreaWithPlaceholder(
- 'Send your first message'
+ sendMessageTextareaAndMessage: commonPage.textAreaWithPlaceholder(
+ 'Type your message'
),
existingSendMessageText: (textMessage: string) =>
`//*[contains(@class, "module-message__text--outgoing") and .//span[contains(@class, "text-selectable")][contains(string(), '${textMessage}')]]`,
- existingFriendRequestText: (textMessage: string) =>
- `//*[contains(@class, "module-message-friend-request__container") and .//span[contains(@class, "text-selectable")][contains(string(), '${textMessage}')]]`,
existingReceivedMessageText: (textMessage: string) =>
`//*[contains(@class, "module-message__text--incoming") and .//span[contains(@class, "text-selectable")][contains(string(), '${textMessage}')]]`,
@@ -92,18 +90,6 @@ export = {
addContactButton: commonPage.divRoleButtonWithText('Add Contact'),
sessionIDInput: commonPage.textAreaWithPlaceholder('Enter a Session ID'),
nextButton: commonPage.divRoleButtonWithText('Next'),
- oneNotificationFriendRequestLeft:
- '//*[contains(@class,"session-icon-button") and .//*[contains(@class, "users")] and .//*[contains(@class, "notification-count") and contains(string(), "1")] ]',
- oneNotificationFriendRequestTop:
- '//*[contains(@class,"notification-count hover") and contains(string(), "1")]',
- friendRequestFromUser: (displayName: string, pubkey: string) =>
- `//*[contains(@class,"module-left-pane__list-popup") and .//*[contains(@class, "module-conversation__user") and .//*[contains(string(), "${displayName}")] and .//*[contains(string(), "(...${pubkey.substring(
- 60
- )})")]]]`,
- acceptFriendRequestButton:
- '//*[contains(@role, "button")][contains(@class, "session-button")][contains(string(), "Accept")]',
- acceptedFriendRequestMessage:
- '//*[contains(@class, "module-friend-request__title")][contains(string(), "Friend request accepted")]',
descriptionDeleteAccount: commonPage.spanWithClassAndText(
'session-confirm-main-message',