Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appium/tests/screenobjects/all-screens.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -13,7 +13,7 @@ import AttachmentScreen from './attachment.screen';

export {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
InboxScreen,
MenuBarScreen,
EmailScreen,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -60,4 +60,4 @@ class CreateKeyScreen extends BaseScreen {
}
}

export default new CreateKeyScreen();
export default new SetupKeyScreen();
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
InboxScreen,
NewMessageScreen
} from '../../screenobjects/all-screens';
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
InboxScreen,
NewMessageScreen,
ContactScreen,
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
InboxScreen,
NewMessageScreen,
EmailScreen
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
InboxScreen,
EmailScreen
} from '../../screenobjects/all-screens';
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
InboxScreen,
EmailScreen,
NewMessageScreen
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions appium/tests/specs/inbox/ReadAttachmentEmail.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
InboxScreen,
EmailScreen,
AttachmentScreen
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions appium/tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
InboxScreen,
EmailScreen
} from '../../screenobjects/all-screens';
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions appium/tests/specs/inbox/ReadTextEmail.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
InboxScreen,
EmailScreen
} from '../../screenobjects/all-screens';
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions appium/tests/specs/login/GmailLogin.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { MockApi } from 'api-mocks/mock';
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
MenuBarScreen
} from '../../screenobjects/all-screens';

Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
SplashScreen,
CreateKeyScreen,
SetupKeyScreen,
MenuBarScreen,
SettingsScreen,
KeysScreen,
Expand All @@ -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();
Expand Down