From 218301246ce8a450611836f18e655309bac02caf Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Thu, 18 Nov 2021 13:20:36 +0200 Subject: [PATCH] changed CreateKeyScreen to SetupKeyScreen --- appium/tests/screenobjects/all-screens.ts | 4 ++-- .../{create-key.screen.ts => setup-key.screen.ts} | 4 ++-- .../composeEmail/CheckComposeEmailAfterReopening.spec.ts | 4 ++-- appium/tests/specs/composeEmail/SelectRecipientByName.spec.ts | 4 ++-- .../composeEmail/SentEmailToRecipientWithoutPublicKey.spec.ts | 4 ++-- .../specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts | 4 ++-- appium/tests/specs/inbox/CheckReplyForEncryptedEmail.spec.ts | 4 ++-- appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts | 4 ++-- appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts | 4 ++-- appium/tests/specs/inbox/ReadTextEmail.spec.ts | 4 ++-- appium/tests/specs/login/GmailLogin.spec.ts | 4 ++-- .../tests/specs/settings/CheckSettingsForLoggedUser.spec.ts | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) rename appium/tests/screenobjects/{create-key.screen.ts => setup-key.screen.ts} (95%) diff --git a/appium/tests/screenobjects/all-screens.ts b/appium/tests/screenobjects/all-screens.ts index a0eb29cc5..36b37feac 100644 --- a/appium/tests/screenobjects/all-screens.ts +++ b/appium/tests/screenobjects/all-screens.ts @@ -1,5 +1,5 @@ import SplashScreen from './splash.screen'; -import CreateKeyScreen from './create-key.screen'; +import SetupKeyScreen from './setup-key.screen'; import InboxScreen from './inbox.screen'; import MenuBarScreen from './menu-bar.screen'; import EmailScreen from './email.screen'; @@ -13,7 +13,7 @@ import AttachmentScreen from './attachment.screen'; export { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, InboxScreen, MenuBarScreen, EmailScreen, diff --git a/appium/tests/screenobjects/create-key.screen.ts b/appium/tests/screenobjects/setup-key.screen.ts similarity index 95% rename from appium/tests/screenobjects/create-key.screen.ts rename to appium/tests/screenobjects/setup-key.screen.ts index 1c7af36f9..93480df4d 100644 --- a/appium/tests/screenobjects/create-key.screen.ts +++ b/appium/tests/screenobjects/setup-key.screen.ts @@ -9,7 +9,7 @@ const SELECTORS = { CONFIRM_PASS_PHRASE_FIELD: '~textField', }; -class CreateKeyScreen extends BaseScreen { +class SetupKeyScreen extends BaseScreen { constructor() { super(SELECTORS.SET_PASS_PHRASE_BUTTON); } @@ -60,4 +60,4 @@ class CreateKeyScreen extends BaseScreen { } } -export default new CreateKeyScreen(); +export default new SetupKeyScreen(); diff --git a/appium/tests/specs/composeEmail/CheckComposeEmailAfterReopening.spec.ts b/appium/tests/specs/composeEmail/CheckComposeEmailAfterReopening.spec.ts index c6635e3c5..625f44eaf 100644 --- a/appium/tests/specs/composeEmail/CheckComposeEmailAfterReopening.spec.ts +++ b/appium/tests/specs/composeEmail/CheckComposeEmailAfterReopening.spec.ts @@ -1,6 +1,6 @@ import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, InboxScreen, NewMessageScreen } from '../../screenobjects/all-screens'; @@ -16,7 +16,7 @@ describe('COMPOSE EMAIL: ', () => { const emailText = CommonData.simpleEmail.message; await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); await InboxScreen.clickCreateEmail(); await NewMessageScreen.composeEmail(recipientEmail, emailSubject, emailText); diff --git a/appium/tests/specs/composeEmail/SelectRecipientByName.spec.ts b/appium/tests/specs/composeEmail/SelectRecipientByName.spec.ts index 5b41a3b43..7f2a419f5 100644 --- a/appium/tests/specs/composeEmail/SelectRecipientByName.spec.ts +++ b/appium/tests/specs/composeEmail/SelectRecipientByName.spec.ts @@ -1,6 +1,6 @@ import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, InboxScreen, NewMessageScreen, ContactScreen, @@ -24,7 +24,7 @@ describe('COMPOSE EMAIL: ', () => { const secondContactItemName = 'Demo key 2'; await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); // Go to Contacts screen await MenuBarScreen.clickMenuIcon(); diff --git a/appium/tests/specs/composeEmail/SentEmailToRecipientWithoutPublicKey.spec.ts b/appium/tests/specs/composeEmail/SentEmailToRecipientWithoutPublicKey.spec.ts index e67e407b0..15ed12351 100644 --- a/appium/tests/specs/composeEmail/SentEmailToRecipientWithoutPublicKey.spec.ts +++ b/appium/tests/specs/composeEmail/SentEmailToRecipientWithoutPublicKey.spec.ts @@ -1,6 +1,6 @@ import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, InboxScreen, NewMessageScreen, EmailScreen @@ -19,7 +19,7 @@ describe('COMPOSE EMAIL: ', () => { const noPublicKeyError = CommonData.errors.noPublicKey; await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); await InboxScreen.clickCreateEmail(); await NewMessageScreen.composeEmail(noPublicKeyRecipient, emailSubject, emailText); diff --git a/appium/tests/specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts b/appium/tests/specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts index 406d0ac0e..82be1cac5 100644 --- a/appium/tests/specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts +++ b/appium/tests/specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts @@ -1,6 +1,6 @@ import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, InboxScreen, EmailScreen } from '../../screenobjects/all-screens'; @@ -21,7 +21,7 @@ describe('INBOX: ', () => { const bundleId = CommonData.bundleId.id; await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); await InboxScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); diff --git a/appium/tests/specs/inbox/CheckReplyForEncryptedEmail.spec.ts b/appium/tests/specs/inbox/CheckReplyForEncryptedEmail.spec.ts index a71b5c996..f574f8ca9 100644 --- a/appium/tests/specs/inbox/CheckReplyForEncryptedEmail.spec.ts +++ b/appium/tests/specs/inbox/CheckReplyForEncryptedEmail.spec.ts @@ -1,6 +1,6 @@ import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, InboxScreen, EmailScreen, NewMessageScreen @@ -20,7 +20,7 @@ describe('INBOX: ', () => { const replyText = `On 10/26/21 at 2:43 PM ${senderEmail} wrote:\n > ${emailText}`; await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); await InboxScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); diff --git a/appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts b/appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts index c0055ceee..d516a9cf0 100644 --- a/appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts +++ b/appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts @@ -1,6 +1,6 @@ import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, InboxScreen, EmailScreen, AttachmentScreen @@ -22,7 +22,7 @@ describe('INBOX: ', () => { const bundleId = CommonData.bundleId.id; await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); await InboxScreen.clickOnEmailBySubject(emailSubject); await EmailScreen.checkOpenedEmail(senderEmail, emailSubject, emailText); diff --git a/appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts b/appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts index 7b7a6f868..56061be4a 100644 --- a/appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts +++ b/appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts @@ -1,6 +1,6 @@ import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, InboxScreen, EmailScreen } from '../../screenobjects/all-screens'; @@ -16,7 +16,7 @@ describe('INBOX: ', () => { const emailText = CommonData.simpleEmail.message; await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); await InboxScreen.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 ec533f1ca..cbe43d889 100644 --- a/appium/tests/specs/inbox/ReadTextEmail.spec.ts +++ b/appium/tests/specs/inbox/ReadTextEmail.spec.ts @@ -1,6 +1,6 @@ import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, InboxScreen, EmailScreen } from '../../screenobjects/all-screens'; @@ -16,7 +16,7 @@ describe('INBOX: ', () => { const emailText = CommonData.simpleEmail.message; await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); await InboxScreen.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 66131a35c..b99bde0da 100644 --- a/appium/tests/specs/login/GmailLogin.spec.ts +++ b/appium/tests/specs/login/GmailLogin.spec.ts @@ -1,7 +1,7 @@ import { MockApi } from 'api-mocks/mock'; import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, MenuBarScreen } from '../../screenobjects/all-screens'; @@ -17,7 +17,7 @@ describe('LOGIN: ', () => { await mockApi.withMockedApis(async () => { await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); 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 e3b331a5e..9b9818de5 100644 --- a/appium/tests/specs/settings/CheckSettingsForLoggedUser.spec.ts +++ b/appium/tests/specs/settings/CheckSettingsForLoggedUser.spec.ts @@ -1,6 +1,6 @@ import { SplashScreen, - CreateKeyScreen, + SetupKeyScreen, MenuBarScreen, SettingsScreen, KeysScreen, @@ -13,7 +13,7 @@ describe('SETTINGS: ', () => { it('user should see public key and should not see private key', async () => { await SplashScreen.login(); - await CreateKeyScreen.setPassPhrase(); + await SetupKeyScreen.setPassPhrase(); await MenuBarScreen.clickMenuIcon(); await MenuBarScreen.checkUserEmail();