diff --git a/appium/tests/screenobjects/all-screens.ts b/appium/tests/screenobjects/all-screens.ts index 507f4c297..cedb21647 100644 --- a/appium/tests/screenobjects/all-screens.ts +++ b/appium/tests/screenobjects/all-screens.ts @@ -1,6 +1,5 @@ import SplashScreen from './splash.screen'; import SetupKeyScreen from './setup-key.screen'; -import InboxScreen from './inbox.screen'; import MenuBarScreen from './menu-bar.screen'; import EmailScreen from './email.screen'; import NewMessageScreen from './new-message.screen'; @@ -10,13 +9,11 @@ import ContactScreen from './contacts.screen'; import ContactPublicKeyScreen from './contact-public-key.screen'; import PublicKeyScreen from './public-key.screen'; import AttachmentScreen from './attachment.screen'; -import SentScreen from './sent.screen'; -import TrashScreen from './trash.screen' +import MailFolderScreen from './mail-folder.screen' export { SplashScreen, SetupKeyScreen, - InboxScreen, MenuBarScreen, EmailScreen, NewMessageScreen, @@ -26,6 +23,5 @@ export { PublicKeyScreen, ContactScreen, ContactPublicKeyScreen, - SentScreen, - TrashScreen + MailFolderScreen }; diff --git a/appium/tests/screenobjects/inbox.screen.ts b/appium/tests/screenobjects/mail-folder.screen.ts similarity index 55% rename from appium/tests/screenobjects/inbox.screen.ts rename to appium/tests/screenobjects/mail-folder.screen.ts index cc158e782..4df7ae415 100644 --- a/appium/tests/screenobjects/inbox.screen.ts +++ b/appium/tests/screenobjects/mail-folder.screen.ts @@ -1,31 +1,63 @@ import BaseScreen from './base.screen'; -import ElementHelper from "../helpers/ElementHelper"; import TouchHelper from "../helpers/TouchHelper"; +import ElementHelper from "../helpers/ElementHelper"; const SELECTORS = { - ENTER_YOUR_PASS_PHRASE_FIELD: '-ios class chain:**/XCUIElementTypeSecureTextField[`value == "Enter your pass phrase"`]', - OK_BUTTON: '~Ok', - CONFIRM_PASS_PHRASE_FIELD: '~textField', + TRASH_HEADER: '-ios class chain:**/XCUIElementTypeNavigationBar[`name == "TRASH"`]', + SENT_HEADER: '-ios class chain:**/XCUIElementTypeNavigationBar[`name == "SENT"`]', CREATE_EMAIL_BUTTON: '-ios class chain:**/XCUIElementTypeButton[`label == "+"`]', - INBOX_HEADER: '-ios class chain:**/XCUIElementTypeStaticText[`label == "INBOX"`]' + INBOX_HEADER: '-ios class chain:**/XCUIElementTypeStaticText[`label == "INBOX"`]', + SEARCH_ICON: '~search icn', + HELP_ICON: '~help icn' }; -class InboxScreen extends BaseScreen { +class MailFolderScreen extends BaseScreen { constructor() { - super(SELECTORS.CONFIRM_PASS_PHRASE_FIELD); + super(SELECTORS.SEARCH_ICON); } - get createEmailButton() { - return $(SELECTORS.CREATE_EMAIL_BUTTON); + get searchIcon() { + return $(SELECTORS.SEARCH_ICON); + } + + get helpIcon() { + return $(SELECTORS.HELP_ICON); + } + + get trashHeader() { + return $(SELECTORS.TRASH_HEADER) + } + + get sentHeader() { + return $(SELECTORS.SENT_HEADER) } get inboxHeader() { return $(SELECTORS.INBOX_HEADER) } - clickOnUserEmail = async (email: string) => { - await (await this.createEmailButton).waitForDisplayed(); - await $(`~${email}`).click(); + get createEmailButton() { + return $(SELECTORS.CREATE_EMAIL_BUTTON); + } + + checkTrashScreen = async () => { + await expect(await this.trashHeader).toBeDisplayed(); + await expect(await this.searchIcon).toBeDisplayed(); + await expect(await this.helpIcon).toBeDisplayed() + } + + checkEmailIsNotDisplayed = async (subject: string) => { + await (await $(`~${subject}`)).waitForDisplayed({ reverse: true }); + } + + checkSentScreen = async () => { + await expect(await this.sentHeader).toBeDisplayed(); + await expect(await this.searchIcon).toBeDisplayed(); + await expect(await this.helpIcon).toBeDisplayed() + } + + refreshMailList = async () => { + await TouchHelper.scrollUp(); } clickOnEmailBySubject = async (subject: string) => { @@ -45,6 +77,11 @@ class InboxScreen extends BaseScreen { await ElementHelper.waitAndClick(await this.createEmailButton, 1000); // delay needed on M1 } + clickOnUserEmail = async (email: string) => { + await (await this.createEmailButton).waitForDisplayed(); + await $(`~${email}`).click(); + } + checkInboxScreen = async () => { await (await this.inboxHeader).waitForDisplayed(); if (await (await this.createEmailButton).isDisplayed() !== true) { @@ -54,4 +91,4 @@ class InboxScreen extends BaseScreen { } } -export default new InboxScreen(); +export default new MailFolderScreen(); diff --git a/appium/tests/screenobjects/sent.screen.ts b/appium/tests/screenobjects/sent.screen.ts deleted file mode 100644 index 94f753d2b..000000000 --- a/appium/tests/screenobjects/sent.screen.ts +++ /dev/null @@ -1,43 +0,0 @@ -import BaseScreen from './base.screen'; -import TouchHelper from "../helpers/TouchHelper"; - -const SELECTORS = { - SENT_HEADER: '-ios class chain:**/XCUIElementTypeNavigationBar[`name == "SENT"`]', - SEARCH_ICON: '~search icn', - HELP_ICON: '~help icn', -}; - - -class SentScreen extends BaseScreen { - constructor() { - super(SELECTORS.SEARCH_ICON); - } - - get searchIcon() { - return $(SELECTORS.SEARCH_ICON); - } - - get helpIcon() { - return $(SELECTORS.HELP_ICON); - } - - get sentHeader() { - return $(SELECTORS.SENT_HEADER) - } - - checkSentScreen = async () => { - await expect(await this.sentHeader).toBeDisplayed(); - await expect(await this.searchIcon).toBeDisplayed(); - await expect(await this.helpIcon).toBeDisplayed() - } - - checkEmailIsNotDisplayed = async (subject: string) => { - await (await $(`~${subject}`)).waitForDisplayed({reverse: true}); - } - - refreshSentList = async () => { - await TouchHelper.pullToRefresh(); - } -} - -export default new SentScreen(); diff --git a/appium/tests/screenobjects/trash.screen.ts b/appium/tests/screenobjects/trash.screen.ts deleted file mode 100644 index 1df2a6d10..000000000 --- a/appium/tests/screenobjects/trash.screen.ts +++ /dev/null @@ -1,42 +0,0 @@ -import BaseScreen from './base.screen'; -import TouchHelper from "../helpers/TouchHelper"; - -const SELECTORS = { - TRASH_HEADER: '-ios class chain:**/XCUIElementTypeNavigationBar[`name == "TRASH"`]', - SEARCH_ICON: '~search icn', - HELP_ICON: '~help icn' -}; - -class TrashScreen extends BaseScreen { - constructor() { - super(SELECTORS.SEARCH_ICON); - } - - get searchIcon() { - return $(SELECTORS.SEARCH_ICON); - } - - get helpIcon() { - return $(SELECTORS.HELP_ICON); - } - - get trashHeader() { - return $(SELECTORS.TRASH_HEADER) - } - - checkTrashScreen = async () => { - await expect(await this.trashHeader).toBeDisplayed(); - await expect(await this.searchIcon).toBeDisplayed(); - await expect(await this.helpIcon).toBeDisplayed() - } - - checkEmailIsNotDisplayed = async (subject: string) => { - await (await $(`~${subject}`)).waitForDisplayed({ reverse: true }); - } - - refreshTrashList = async () => { - await TouchHelper.pullToRefresh(); - } -} - -export default new TrashScreen(); diff --git a/appium/tests/specs/composeEmail/CheckComposeEmailAfterReopening.spec.ts b/appium/tests/specs/composeEmail/CheckComposeEmailAfterReopening.spec.ts index f46978253..cbb880551 100644 --- a/appium/tests/specs/composeEmail/CheckComposeEmailAfterReopening.spec.ts +++ b/appium/tests/specs/composeEmail/CheckComposeEmailAfterReopening.spec.ts @@ -1,7 +1,7 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, NewMessageScreen } from '../../screenobjects/all-screens'; @@ -17,9 +17,9 @@ describe('COMPOSE EMAIL: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); - await InboxScreen.clickCreateEmail(); + await MailFolderScreen.clickCreateEmail(); await NewMessageScreen.composeEmail(recipientEmail, emailSubject, emailText); await NewMessageScreen.checkFilledComposeEmailInfo(recipientEmail, emailSubject, emailText); diff --git a/appium/tests/specs/composeEmail/SelectRecipientByName.spec.ts b/appium/tests/specs/composeEmail/SelectRecipientByName.spec.ts index 1465e0dd1..341288187 100644 --- a/appium/tests/specs/composeEmail/SelectRecipientByName.spec.ts +++ b/appium/tests/specs/composeEmail/SelectRecipientByName.spec.ts @@ -1,7 +1,7 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, NewMessageScreen, ContactScreen, ContactPublicKeyScreen, @@ -25,7 +25,7 @@ describe('COMPOSE EMAIL: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); // Go to Contacts screen await MenuBarScreen.clickMenuIcon(); @@ -41,16 +41,16 @@ describe('COMPOSE EMAIL: ', () => { await MenuBarScreen.clickMenuIcon(); await MenuBarScreen.clickInboxButton(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); // Add first contact - await InboxScreen.clickCreateEmail(); + await MailFolderScreen.clickCreateEmail(); await NewMessageScreen.setAddRecipientByName(firstContactName, firstContactEmail); await NewMessageScreen.checkAddedRecipient(firstContactEmail); await NewMessageScreen.clickBackButton(); // Add second contact - await InboxScreen.clickCreateEmail(); + await MailFolderScreen.clickCreateEmail(); await NewMessageScreen.setAddRecipientByName(secondContactName, secondContactEmail); await NewMessageScreen.checkAddedRecipient(secondContactEmail); await NewMessageScreen.clickBackButton(); diff --git a/appium/tests/specs/composeEmail/SendEmailToRecipientWithoutPublicKey.spec.ts b/appium/tests/specs/composeEmail/SendEmailToRecipientWithoutPublicKey.spec.ts index 6aa08f605..4b8602c03 100644 --- a/appium/tests/specs/composeEmail/SendEmailToRecipientWithoutPublicKey.spec.ts +++ b/appium/tests/specs/composeEmail/SendEmailToRecipientWithoutPublicKey.spec.ts @@ -1,7 +1,7 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, NewMessageScreen } from '../../screenobjects/all-screens'; @@ -18,9 +18,9 @@ describe('COMPOSE EMAIL: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); - await InboxScreen.clickCreateEmail(); + await MailFolderScreen.clickCreateEmail(); await NewMessageScreen.composeEmail(noPublicKeyRecipient, emailSubject, emailText); await NewMessageScreen.checkFilledComposeEmailInfo(noPublicKeyRecipient, emailSubject, emailText); await NewMessageScreen.clickSendButton(); diff --git a/appium/tests/specs/composeEmail/SendEncryptedEmailAfterPassPhraseSessionEndedAndTrashIt.spec.ts b/appium/tests/specs/composeEmail/SendEncryptedEmailAfterPassPhraseSessionEndedAndTrashIt.spec.ts index 55fa519cd..c63209478 100644 --- a/appium/tests/specs/composeEmail/SendEncryptedEmailAfterPassPhraseSessionEndedAndTrashIt.spec.ts +++ b/appium/tests/specs/composeEmail/SendEncryptedEmailAfterPassPhraseSessionEndedAndTrashIt.spec.ts @@ -1,12 +1,10 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, NewMessageScreen, EmailScreen, MenuBarScreen, - SentScreen, - TrashScreen } from '../../screenobjects/all-screens'; import { CommonData } from '../../data'; @@ -27,13 +25,13 @@ describe('COMPOSE EMAIL: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); //Restart app to reset pass phrase memory cache await driver.terminateApp(bundleId); await driver.activateApp(bundleId); - await InboxScreen.clickCreateEmail(); + await MailFolderScreen.clickCreateEmail(); await NewMessageScreen.composeEmail(contactEmail, emailSubject, emailText); await NewMessageScreen.checkFilledComposeEmailInfo(contactEmail, emailSubject, emailText); //Set wrong pass phrase and check error @@ -46,35 +44,35 @@ describe('COMPOSE EMAIL: ', () => { await NewMessageScreen.clickSendButton(); await EmailScreen.enterPassPhrase(passPhrase); await EmailScreen.clickOkButton(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); await MenuBarScreen.clickMenuIcon(); await MenuBarScreen.clickSentButton(); - await SentScreen.checkSentScreen(); + await MailFolderScreen.checkSentScreen(); //Check sent email - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); //Delete sent email await EmailScreen.clickDeleteButton(); - await SentScreen.checkSentScreen(); - await SentScreen.checkEmailIsNotDisplayed(emailSubject); + await MailFolderScreen.checkSentScreen(); + await MailFolderScreen.checkEmailIsNotDisplayed(emailSubject); await browser.pause(2000); // give Google API time to process the deletion - await SentScreen.refreshSentList(); - await SentScreen.checkSentScreen(); - await SentScreen.checkEmailIsNotDisplayed(emailSubject); + await MailFolderScreen.refreshMailList(); + await MailFolderScreen.checkSentScreen(); + await MailFolderScreen.checkEmailIsNotDisplayed(emailSubject); //Check email in Trash list await MenuBarScreen.clickMenuIcon(); await MenuBarScreen.clickTrashButton(); - await TrashScreen.checkTrashScreen(); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.checkTrashScreen(); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); //Remove from Trash await EmailScreen.clickDeleteButton(); await EmailScreen.confirmDelete(); - await TrashScreen.checkTrashScreen(); + await MailFolderScreen.checkTrashScreen(); await browser.pause(2000); // give Google API time to process the deletion - await TrashScreen.refreshTrashList(); - await TrashScreen.checkTrashScreen(); - await TrashScreen.checkEmailIsNotDisplayed(emailSubject); + await MailFolderScreen.refreshMailList(); + await MailFolderScreen.checkTrashScreen(); + await MailFolderScreen.checkEmailIsNotDisplayed(emailSubject); }); }); diff --git a/appium/tests/specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts b/appium/tests/specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts index ff6a6f996..c717ff871 100644 --- a/appium/tests/specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts +++ b/appium/tests/specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts @@ -1,7 +1,7 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, EmailScreen } from '../../screenobjects/all-screens'; @@ -22,15 +22,15 @@ describe('INBOX: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); await driver.terminateApp(bundleId); await driver.activateApp(bundleId); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); //try to see encrypted message with wrong pass phrase await EmailScreen.enterPassPhrase(wrongPassPhrase); @@ -44,7 +44,7 @@ describe('INBOX: ', () => { //reopen email without pass phrase await EmailScreen.clickBackButton(); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); }); }); diff --git a/appium/tests/specs/inbox/CheckReplyAndForwardForEncryptedEmail.spec.ts b/appium/tests/specs/inbox/CheckReplyAndForwardForEncryptedEmail.spec.ts index 786b51218..6dfa36c86 100644 --- a/appium/tests/specs/inbox/CheckReplyAndForwardForEncryptedEmail.spec.ts +++ b/appium/tests/specs/inbox/CheckReplyAndForwardForEncryptedEmail.spec.ts @@ -1,7 +1,7 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, EmailScreen, NewMessageScreen } from '../../screenobjects/all-screens'; @@ -22,14 +22,14 @@ describe('INBOX: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); await EmailScreen.clickReplyButton(); await NewMessageScreen.checkFilledComposeEmailInfo(senderEmail, replySubject, quoteText); - + await NewMessageScreen.clickBackButton(); await EmailScreen.clickMenuButton(); await EmailScreen.clickForwardButton(); diff --git a/appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts b/appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts index f5fa64c28..d7b3f82fa 100644 --- a/appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts +++ b/appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts @@ -1,7 +1,7 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, EmailScreen, AttachmentScreen } from '../../screenobjects/all-screens'; @@ -23,16 +23,16 @@ describe('INBOX: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); await EmailScreen.checkAttachment(attachmentName); //disabled due to await driver.terminateApp(bundleId); await driver.activateApp(bundleId); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); //try to see encrypted message with wrong pass phrase await EmailScreen.enterPassPhrase(wrongPassPhrase); @@ -52,7 +52,7 @@ describe('INBOX: ', () => { await EmailScreen.checkAttachment(attachmentName); await EmailScreen.clickBackButton(); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); await EmailScreen.checkAttachment(attachmentName); await EmailScreen.clickOnDownloadButton(); diff --git a/appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts b/appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts index 59bbc71b7..3a0f48207 100644 --- a/appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts +++ b/appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts @@ -1,7 +1,7 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, EmailScreen } from '../../screenobjects/all-screens'; @@ -17,15 +17,15 @@ describe('INBOX: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); await driver.terminateApp(CommonData.bundleId.id); await driver.activateApp(CommonData.bundleId.id); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); }); }); diff --git a/appium/tests/specs/inbox/ReadKeyMismatchEmail.spec.ts b/appium/tests/specs/inbox/ReadKeyMismatchEmail.spec.ts index d34a44993..9f70beb14 100644 --- a/appium/tests/specs/inbox/ReadKeyMismatchEmail.spec.ts +++ b/appium/tests/specs/inbox/ReadKeyMismatchEmail.spec.ts @@ -1,7 +1,7 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, EmailScreen } from '../../screenobjects/all-screens'; @@ -17,8 +17,9 @@ describe('INBOX: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); + await MailFolderScreen.checkInboxScreen() - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); }); }); diff --git a/appium/tests/specs/inbox/ReadTextEmail.spec.ts b/appium/tests/specs/inbox/ReadTextEmail.spec.ts index 6be0b3edb..39499532d 100644 --- a/appium/tests/specs/inbox/ReadTextEmail.spec.ts +++ b/appium/tests/specs/inbox/ReadTextEmail.spec.ts @@ -1,7 +1,7 @@ import { SplashScreen, SetupKeyScreen, - InboxScreen, + MailFolderScreen, EmailScreen } from '../../screenobjects/all-screens'; @@ -17,9 +17,9 @@ describe('INBOX: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); - await InboxScreen.clickOnEmailBySubject(emailSubject); + await MailFolderScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); }); }); diff --git a/appium/tests/specs/login/GmailLogin.spec.ts b/appium/tests/specs/login/GmailLogin.spec.ts index c025ead33..666acca17 100644 --- a/appium/tests/specs/login/GmailLogin.spec.ts +++ b/appium/tests/specs/login/GmailLogin.spec.ts @@ -3,7 +3,7 @@ import { SplashScreen, SetupKeyScreen, MenuBarScreen, - InboxScreen + MailFolderScreen } from '../../screenobjects/all-screens'; @@ -19,7 +19,7 @@ describe('LOGIN: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); await MenuBarScreen.clickMenuIcon(); await MenuBarScreen.checkUserEmail(); diff --git a/appium/tests/specs/settings/CheckSettingsForLoggedUser.spec.ts b/appium/tests/specs/settings/CheckSettingsForLoggedUser.spec.ts index b77d2a1fb..2f3ff4ee4 100644 --- a/appium/tests/specs/settings/CheckSettingsForLoggedUser.spec.ts +++ b/appium/tests/specs/settings/CheckSettingsForLoggedUser.spec.ts @@ -5,7 +5,7 @@ import { SettingsScreen, KeysScreen, PublicKeyScreen, - InboxScreen + MailFolderScreen } from '../../screenobjects/all-screens'; @@ -15,7 +15,7 @@ describe('SETTINGS: ', () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); - await InboxScreen.checkInboxScreen(); + await MailFolderScreen.checkInboxScreen(); await MenuBarScreen.clickMenuIcon(); await MenuBarScreen.checkUserEmail();