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
17 changes: 9 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GEM
specs:
CFPropertyList (3.0.5)
rexml
activesupport (6.1.4.4)
activesupport (6.1.4.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -17,8 +17,8 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.552.0)
aws-sdk-core (3.126.0)
aws-partitions (1.554.0)
aws-sdk-core (3.126.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -116,7 +116,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.204.2)
fastlane (2.204.3)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -183,15 +183,15 @@ GEM
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.2.0)
google-cloud-storage (1.36.0)
google-cloud-storage (1.36.1)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.1)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.1.0)
googleauth (1.1.1)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
Expand All @@ -203,9 +203,9 @@ GEM
http-cookie (1.0.4)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.9.1)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
jmespath (1.5.0)
jmespath (1.6.0)
json (2.6.1)
jwt (2.3.0)
memoist (0.16.2)
Expand Down Expand Up @@ -288,6 +288,7 @@ GEM

PLATFORMS
arm64-darwin-21
ruby
x86_64-darwin-20

DEPENDENCIES
Expand Down
128 changes: 65 additions & 63 deletions appium/tests/specs/live/login/LoginToMultipleAccounts.spec.ts
Original file line number Diff line number Diff line change
@@ -1,92 +1,94 @@
import {
SplashScreen,
SetupKeyScreen,
MailFolderScreen,
SearchScreen,
EmailScreen,
MenuBarScreen
} from '../../../screenobjects/all-screens';
import {CommonData} from "../../../data";
import BaseScreen from "../../../screenobjects/base.screen";
// Temporary disabled because of https://github.com/FlowCrypt/flowcrypt-ios/issues/1383

// import {
// SplashScreen,
// SetupKeyScreen,
// MailFolderScreen,
// SearchScreen,
// EmailScreen,
// MenuBarScreen
// } from '../../../screenobjects/all-screens';
// import {CommonData} from "../../../data";
// import BaseScreen from "../../../screenobjects/base.screen";

describe('LOGIN: ', () => {

it('user should be able login to multiple accounts', async () => {
// describe('LOGIN: ', () => {

const senderOutlook = CommonData.outlookEmail.sender;
const subjectOutlook = CommonData.outlookEmail.subject;
const messageOutlook = CommonData.outlookEmail.message;
const outlookEmail = CommonData.outlookAccount.email;
const outlookFolder = CommonData.outlookAccount.outlookFolder;
// it('user should be able login to multiple accounts', async () => {

const senderGmail = CommonData.recipientsListEmail.sender;
const subjectGmail = CommonData.recipientsListEmail.subject;
const messageGmail = CommonData.recipientsListEmail.message;
const gmailFolder = CommonData.account.folder;
const wrongPassPhraseError = CommonData.errors.wrongPassPhraseOnLogin;
// const senderOutlook = CommonData.outlookEmail.sender;
// const subjectOutlook = CommonData.outlookEmail.subject;
// const messageOutlook = CommonData.outlookEmail.message;
// const outlookEmail = CommonData.outlookAccount.email;
// const outlookFolder = CommonData.outlookAccount.outlookFolder;

await SplashScreen.loginToOtherEmailProvider();
await SetupKeyScreen.setPassPhraseForOtherProviderEmail('wrong');
await BaseScreen.checkModalMessage(wrongPassPhraseError);
await BaseScreen.clickOkButtonOnError();
await SetupKeyScreen.setPassPhraseForOtherProviderEmail();
await MailFolderScreen.checkInboxScreen();
// const senderGmail = CommonData.recipientsListEmail.sender;
// const subjectGmail = CommonData.recipientsListEmail.subject;
// const messageGmail = CommonData.recipientsListEmail.message;
// const gmailFolder = CommonData.account.folder;
// const wrongPassPhraseError = CommonData.errors.wrongPassPhraseOnLogin;

await MailFolderScreen.clickSearchButton();
// await SplashScreen.loginToOtherEmailProvider();
// await SetupKeyScreen.setPassPhraseForOtherProviderEmail('wrong');
// await BaseScreen.checkModalMessage(wrongPassPhraseError);
// await BaseScreen.clickOkButtonOnError();
// await SetupKeyScreen.setPassPhraseForOtherProviderEmail();
// await MailFolderScreen.checkInboxScreen();

await SearchScreen.searchAndClickEmailForOutlook(subjectOutlook);
await EmailScreen.checkOpenedEmail(senderOutlook, subjectOutlook, messageOutlook);
// await MailFolderScreen.clickSearchButton();

await EmailScreen.clickBackButton();
// await SearchScreen.searchAndClickEmailForOutlook(subjectOutlook);
// await EmailScreen.checkOpenedEmail(senderOutlook, subjectOutlook, messageOutlook);

await SearchScreen.clickBackButton();
// await EmailScreen.clickBackButton();

await MenuBarScreen.clickMenuIcon();
await MenuBarScreen.checkUserEmail(outlookEmail);
await MenuBarScreen.checkMenuBarItem(outlookFolder);
// await SearchScreen.clickBackButton();

await MenuBarScreen.clickOnUserEmail(outlookEmail);
// await MenuBarScreen.clickMenuIcon();
// await MenuBarScreen.checkUserEmail(outlookEmail);
// await MenuBarScreen.checkMenuBarItem(outlookFolder);

await MenuBarScreen.clickAddAccountButton();
// await MenuBarScreen.clickOnUserEmail(outlookEmail);

await SplashScreen.checkLoginPage();
// await MenuBarScreen.clickAddAccountButton();

await SplashScreen.login();
// await SplashScreen.checkLoginPage();

await SetupKeyScreen.setPassPhrase();
await MailFolderScreen.checkInboxScreen();
// await SplashScreen.login();

await MailFolderScreen.clickSearchButton();
// await SetupKeyScreen.setPassPhrase();
// await MailFolderScreen.checkInboxScreen();

await SearchScreen.searchAndClickEmailForOutlook(subjectGmail);
await EmailScreen.checkOpenedEmail(senderGmail, subjectGmail, messageGmail);
// await MailFolderScreen.clickSearchButton();

await EmailScreen.clickBackButton();
// await SearchScreen.searchAndClickEmailForOutlook(subjectGmail);
// await EmailScreen.checkOpenedEmail(senderGmail, subjectGmail, messageGmail);

await SearchScreen.clickBackButton();
// await EmailScreen.clickBackButton();

await MenuBarScreen.clickMenuIcon();
await MenuBarScreen.checkUserEmail();
await MenuBarScreen.checkMenuBarItem(gmailFolder);
// await SearchScreen.clickBackButton();

await MenuBarScreen.clickOnUserEmail();
// await MenuBarScreen.clickMenuIcon();
// await MenuBarScreen.checkUserEmail();
// await MenuBarScreen.checkMenuBarItem(gmailFolder);

await MenuBarScreen.selectAccount(1);
// await MenuBarScreen.clickOnUserEmail();

await MailFolderScreen.checkInboxScreen();
// await MenuBarScreen.selectAccount(1);

await MailFolderScreen.clickSearchButton();
// await MailFolderScreen.checkInboxScreen();

await SearchScreen.searchAndClickEmailForOutlook(subjectOutlook);
await EmailScreen.checkOpenedEmail(senderOutlook, subjectOutlook, messageOutlook);
// await MailFolderScreen.clickSearchButton();

await EmailScreen.clickBackButton();
// await SearchScreen.searchAndClickEmailForOutlook(subjectOutlook);
// await EmailScreen.checkOpenedEmail(senderOutlook, subjectOutlook, messageOutlook);

await SearchScreen.clickBackButton();
// await EmailScreen.clickBackButton();

await MenuBarScreen.clickMenuIcon();
await MenuBarScreen.checkUserEmail(outlookEmail);
await MenuBarScreen.checkMenuBarItem(outlookFolder);
});
});
// await SearchScreen.clickBackButton();

// await MenuBarScreen.clickMenuIcon();
// await MenuBarScreen.checkUserEmail(outlookEmail);
// await MenuBarScreen.checkMenuBarItem(outlookFolder);
// });
// });