SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix server login e2e for android

Browse Source
This commit is contained in:
Joseph Baylon
2023-02-06 12:21:31 -08:00
committed by Elisabeth Kulzer
parent 3538205f81
commit ee477c16fa
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
detox/e2e/support/ui/screen/server_list.ts
View File

@@ -62,7 +62,10 @@ class ServerListScreen {
// # Open server list screen
await ChannelListScreen.serverIcon.tap();
return this.toBeVisible();
if (isIos()) {
return this.toBeVisible();
}
return null;
};
close = async () => {
@@ -77,9 +80,14 @@ class ServerListScreen {
};
closeTutorial = async () => {
await waitFor(this.tutorialHighlight).toExist().withTimeout(timeouts.TEN_SEC);
await this.tutorialSwipeLeft.tap();
await expect(this.tutorialHighlight).not.toExist();
if (isIos()) {
await waitFor(this.tutorialHighlight).toExist().withTimeout(timeouts.TEN_SEC);
await this.tutorialSwipeLeft.tap();
await expect(this.tutorialHighlight).not.toExist();
} else {
await wait(timeouts.ONE_SEC);
await device.pressBack();
}
};
}

16
detox/e2e/test/server_login/connect_to_server.e2e.ts
View File

@@ -12,11 +12,12 @@ import {
LoginScreen,
ServerScreen,
} from '@support/ui/screen';
import {timeouts} from '@support/utils';
import {timeouts, wait} from '@support/utils';
import {expect} from 'detox';
describe('Server Login - Connect to Server', () => {
const {
connectButton,
connectButtonDisabled,
displayHelp,
headerDescription,
@@ -25,7 +26,6 @@ describe('Server Login - Connect to Server', () => {
serverDisplayNameInput,
serverUrlInput,
serverUrlInputError,
tapConnectButton,
} = ServerScreen;
beforeEach(async () => {
@@ -69,7 +69,8 @@ describe('Server Login - Connect to Server', () => {
const invalidServerUrl = 'invalid';
await serverUrlInput.replaceText(invalidServerUrl);
await serverDisplayNameInput.replaceText('Server 1');
await tapConnectButton();
await connectButton.tap();
await wait(timeouts.ONE_SEC);
// * Verify invalid url error
await waitFor(serverUrlInputError).toExist().withTimeout(timeouts.TEN_SEC);
@@ -81,7 +82,8 @@ describe('Server Login - Connect to Server', () => {
const connectionError = 'Cannot connect to the server.';
await serverUrlInput.replaceText('expired.badssl.com');
await serverDisplayNameInput.replaceText('Server 1');
await tapConnectButton();
await connectButton.tap();
await wait(timeouts.ONE_SEC);
// * Verify connection error
await waitFor(serverUrlInputError).toExist().withTimeout(timeouts.TEN_SEC);
@@ -91,7 +93,8 @@ describe('Server Login - Connect to Server', () => {
await device.reloadReactNative();
await serverUrlInput.replaceText('wrong.host.badssl.com');
await serverDisplayNameInput.replaceText('Server 1');
await tapConnectButton();
await connectButton.tap();
await wait(timeouts.ONE_SEC);
// * Verify connection error
await waitFor(serverUrlInputError).toExist().withTimeout(timeouts.TEN_SEC);
@@ -102,7 +105,8 @@ describe('Server Login - Connect to Server', () => {
// # Connect to server with valid server url and non-empty server display name
await serverUrlInput.replaceText(serverOneUrl);
await serverDisplayNameInput.replaceText('Server 1');
await tapConnectButton();
await connectButton.tap();
await wait(timeouts.ONE_SEC);
// * Verify on login screen
await LoginScreen.toBeVisible();