From 6bd26d0627f008901d0b4ad3eaf789b8a1e4bafc Mon Sep 17 00:00:00 2001 From: Gung Wah Date: Thu, 4 Mar 2021 14:20:26 +0800 Subject: [PATCH 1/2] [E2E TEST] Draft message --- e2e/tests/room/02-room.spec.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/e2e/tests/room/02-room.spec.js b/e2e/tests/room/02-room.spec.js index a4720ba7a34..623a72747c8 100644 --- a/e2e/tests/room/02-room.spec.js +++ b/e2e/tests/room/02-room.spec.js @@ -14,8 +14,8 @@ async function navigateToRoom(roomName) { await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000); } +const mainRoom = data.groups.private.name; describe('Room screen', () => { - const mainRoom = data.groups.private.name; before(async() => { await navigateToRoom(mainRoom); @@ -126,6 +126,17 @@ describe('Room screen', () => { await expect(element(by.id('messagebox-input'))).toHaveText('#general '); await element(by.id('messagebox-input')).clearText(); }); + + it('should draft message', async () => { + await element(by.id('messagebox-input')).atIndex(0).tap(); + await element(by.id('messagebox-input')).atIndex(0).typeText(`${ data.random }draft`); + await tapBack(); + await element(by.id(`rooms-list-view-item-${ mainRoom }`)).tap(); + await expect(element(by.id('messagebox-input'))).toHaveText(`${ data.random }draft`); + await element(by.id('messagebox-input')).clearText(); + }); + + }); describe('Message', async() => { @@ -280,11 +291,18 @@ describe('Room screen', () => { await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000); await waitFor(element(by.id(`room-view-title-${ thread }`))).toExist().withTimeout(5000); await expect(element(by.id(`room-view-title-${ thread }`))).toExist(); + }); + + it('should draft thread message', async () => { + await element(by.id('messagebox-input')).atIndex(0).tap(); + await element(by.id('messagebox-input')).atIndex(0).typeText(`${ thread }draft`); await tapBack(); + await element(by.id(`message-thread-button-${ thread }`)).tap(); + await expect(element(by.id('messagebox-input')).atIndex(0)).toHaveText(`${ thread }draft`); + await element(by.id('messagebox-input')).atIndex(0).clearText(); }); it('should toggle follow thread', async() => { - await element(by.id(`message-thread-button-${ thread }`)).tap(); await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000); await waitFor(element(by.id(`room-view-title-${ thread }`))).toExist().withTimeout(5000); await expect(element(by.id(`room-view-title-${ thread }`))).toExist(); From da6a77bc4599830af32cdae8aa501a27170b93f0 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 9 Mar 2021 15:51:36 -0300 Subject: [PATCH 2/2] Fix tests --- e2e/tests/room/02-room.spec.js | 47 +++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/e2e/tests/room/02-room.spec.js b/e2e/tests/room/02-room.spec.js index 623a72747c8..d4090d6c978 100644 --- a/e2e/tests/room/02-room.spec.js +++ b/e2e/tests/room/02-room.spec.js @@ -5,19 +5,19 @@ const data = require('../../data'); const { navigateToLogin, login, mockMessage, tapBack, sleep, searchRoom, starMessage, pinMessage, dismissReviewNag, tryTapping } = require('../../helpers/app'); async function navigateToRoom(roomName) { - await device.launchApp({ permissions: { notifications: 'YES' }, delete: true }); - await navigateToLogin(); - await login(data.users.regular.username, data.users.regular.password); await searchRoom(`${ roomName }`); await waitFor(element(by.id(`rooms-list-view-item-${ roomName }`))).toExist().withTimeout(60000); await element(by.id(`rooms-list-view-item-${ roomName }`)).tap(); await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000); } -const mainRoom = data.groups.private.name; describe('Room screen', () => { + const mainRoom = data.groups.private.name; before(async() => { + await device.launchApp({ permissions: { notifications: 'YES' }, delete: true }); + await navigateToLogin(); + await login(data.users.regular.username, data.users.regular.password); await navigateToRoom(mainRoom); }); @@ -131,12 +131,15 @@ describe('Room screen', () => { await element(by.id('messagebox-input')).atIndex(0).tap(); await element(by.id('messagebox-input')).atIndex(0).typeText(`${ data.random }draft`); await tapBack(); - await element(by.id(`rooms-list-view-item-${ mainRoom }`)).tap(); + + await navigateToRoom(mainRoom); await expect(element(by.id('messagebox-input'))).toHaveText(`${ data.random }draft`); await element(by.id('messagebox-input')).clearText(); - }); + await tapBack(); - + await navigateToRoom(mainRoom); + await expect(element(by.id('messagebox-input'))).toHaveText(''); + }); }); describe('Message', async() => { @@ -291,18 +294,11 @@ describe('Room screen', () => { await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000); await waitFor(element(by.id(`room-view-title-${ thread }`))).toExist().withTimeout(5000); await expect(element(by.id(`room-view-title-${ thread }`))).toExist(); - }); - - it('should draft thread message', async () => { - await element(by.id('messagebox-input')).atIndex(0).tap(); - await element(by.id('messagebox-input')).atIndex(0).typeText(`${ thread }draft`); await tapBack(); - await element(by.id(`message-thread-button-${ thread }`)).tap(); - await expect(element(by.id('messagebox-input')).atIndex(0)).toHaveText(`${ thread }draft`); - await element(by.id('messagebox-input')).atIndex(0).clearText(); }); it('should toggle follow thread', async() => { + await element(by.id(`message-thread-button-${ thread }`)).tap(); await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000); await waitFor(element(by.id(`room-view-title-${ thread }`))).toExist().withTimeout(5000); await expect(element(by.id(`room-view-title-${ thread }`))).toExist(); @@ -370,6 +366,27 @@ describe('Room screen', () => { await expect(element(by.id('thread-messages-view'))).toExist(); await tapBack(); }); + + it('should draft thread message', async () => { + await element(by.id(`message-thread-button-${ thread }`)).tap(); + await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000); + await waitFor(element(by.id(`room-view-title-${ thread }`))).toExist().withTimeout(5000); + await element(by.id('messagebox-input')).atIndex(0).tap(); + await element(by.id('messagebox-input')).atIndex(0).typeText(`${ thread }draft`); + await tapBack(); + + await element(by.id(`message-thread-button-${ thread }`)).tap(); + await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000); + await waitFor(element(by.id(`room-view-title-${ thread }`))).toExist().withTimeout(5000); + await expect(element(by.id('messagebox-input')).atIndex(0)).toHaveText(`${ thread }draft`); + await element(by.id('messagebox-input')).atIndex(0).clearText(); + await tapBack(); + + await element(by.id(`message-thread-button-${ thread }`)).tap(); + await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000); + await waitFor(element(by.id(`room-view-title-${ thread }`))).toExist().withTimeout(5000); + await expect(element(by.id('messagebox-input')).atIndex(0)).toHaveText(''); + }); }); // after(async() => {