From 944c8e1665732f1dd5a5916e5b8fec64815ae9bf Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Thu, 9 Dec 2021 10:07:46 +0200 Subject: [PATCH 1/3] added new specs for checking recipient after mock --- .../setup/CannotFindEmailOnAttester.spec.ts | 29 ++++++++++++++++++ .../DisallowAttesterSearchForDomains.spec.ts | 30 +++++++++++++++++++ .../mock/setup/FindEmailOnAttester.spec.ts | 28 +++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 appium/tests/specs/mock/setup/CannotFindEmailOnAttester.spec.ts create mode 100644 appium/tests/specs/mock/setup/DisallowAttesterSearchForDomains.spec.ts create mode 100644 appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts diff --git a/appium/tests/specs/mock/setup/CannotFindEmailOnAttester.spec.ts b/appium/tests/specs/mock/setup/CannotFindEmailOnAttester.spec.ts new file mode 100644 index 000000000..0a6fd0aca --- /dev/null +++ b/appium/tests/specs/mock/setup/CannotFindEmailOnAttester.spec.ts @@ -0,0 +1,29 @@ +import { MockApi } from 'api-mocks/mock'; +import { + SplashScreen, +} from '../../../screenobjects/all-screens'; +import {attesterPublicKeySamples} from "../../../../api-mocks/apis/attester/attester-endpoints"; +import SetupKeyScreen from "../../../screenobjects/setup-key.screen"; +import MailFolderScreen from "../../../screenobjects/mail-folder.screen"; +import NewMessageScreen from "../../../screenobjects/new-message.screen"; + +describe('SETUP: ', () => { + + it('Cannot find email on attester', async () => { + + const mockApi = new MockApi(); + + mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", + "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], + key_manager_url: "https://ekm.flowcrypt.com", disallow_attester_search_for_domains: ["*"]}}; + mockApi.attesterConfig = {servedPubkeys: {'available.on@attester.test': attesterPublicKeySamples.valid}}; + + await mockApi.withMockedApis(async () => { + await SplashScreen.login(); + await SetupKeyScreen.setPassPhrase(); + await MailFolderScreen.checkInboxScreen(); + await MailFolderScreen.clickCreateEmail(); + await NewMessageScreen.setAddRecipient('available.on@attester.test'); + }); + }); +}); diff --git a/appium/tests/specs/mock/setup/DisallowAttesterSearchForDomains.spec.ts b/appium/tests/specs/mock/setup/DisallowAttesterSearchForDomains.spec.ts new file mode 100644 index 000000000..61e26f2c4 --- /dev/null +++ b/appium/tests/specs/mock/setup/DisallowAttesterSearchForDomains.spec.ts @@ -0,0 +1,30 @@ +import { MockApi } from 'api-mocks/mock'; +import { + SplashScreen, +} from '../../../screenobjects/all-screens'; +import {attesterPublicKeySamples} from "../../../../api-mocks/apis/attester/attester-endpoints"; +import SetupKeyScreen from "../../../screenobjects/setup-key.screen"; +import MailFolderScreen from "../../../screenobjects/mail-folder.screen"; +import NewMessageScreen from "../../../screenobjects/new-message.screen"; + +describe('SETUP: ', () => { + + it('Disallow attester search for domains', async () => { + + const mockApi = new MockApi(); + mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], key_manager_url: "https://ekm.flowcrypt.com", disallow_attester_search_for_domains: ["disabled.test"]}}; + mockApi.attesterConfig = {servedPubkeys: {'attester@disabled.test': attesterPublicKeySamples.valid, 'attester@enabled.test': attesterPublicKeySamples.valid}}; + + await mockApi.withMockedApis(async () => { + await SplashScreen.login(); + await SetupKeyScreen.setPassPhrase(); + await MailFolderScreen.checkInboxScreen(); + await MailFolderScreen.clickCreateEmail(); + + // Searching for recipients + await NewMessageScreen.setAddRecipient('attester@disabled.test'); + await NewMessageScreen.setAddRecipient('attester@enabled.test'); + + }); + }); +}); diff --git a/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts b/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts new file mode 100644 index 000000000..4b2bf9a8b --- /dev/null +++ b/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts @@ -0,0 +1,28 @@ +import { MockApi } from 'api-mocks/mock'; +import { + SplashScreen, +} from '../../../screenobjects/all-screens'; +import {attesterPublicKeySamples} from "../../../../api-mocks/apis/attester/attester-endpoints"; +import SetupKeyScreen from "../../../screenobjects/setup-key.screen"; +import MailFolderScreen from "../../../screenobjects/mail-folder.screen"; +import NewMessageScreen from "../../../screenobjects/new-message.screen"; + +describe('SETUP: ', () => { + + it('Can find email on attester', async () => { + + const mockApi = new MockApi(); + + mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", + "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], key_manager_url: "https://ekm.flowcrypt.com"}}; + mockApi.attesterConfig = { servedPubkeys: {'available.on@attester.test': attesterPublicKeySamples.valid}}; + + await mockApi.withMockedApis(async () => { + await SplashScreen.login(); + await SetupKeyScreen.setPassPhrase(); + await MailFolderScreen.checkInboxScreen(); + await MailFolderScreen.clickCreateEmail(); + await NewMessageScreen.setAddRecipient('available.on@attester.test'); + }); + }); +}); From 3a908b49a70cc1b63b04534357df99785369e97b Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Tue, 14 Dec 2021 10:59:32 +0200 Subject: [PATCH 2/3] added new specs for checking attester mock api --- .../tests/screenobjects/mail-folder.screen.ts | 10 +++--- .../tests/screenobjects/new-message.screen.ts | 8 ++++- ...thDisallowAttesterSearchForDomain.spec.ts} | 3 +- .../DisallowAttesterSearchForDomains.spec.ts | 30 ----------------- .../mock/setup/FindEmailOnAttester.spec.ts | 28 ++++++++-------- ...erSearchForDomainsOnPreDomainBasic.spec.ts | 33 +++++++++++++++++++ 6 files changed, 60 insertions(+), 52 deletions(-) rename appium/tests/specs/mock/setup/{CannotFindEmailOnAttester.spec.ts => CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts} (86%) delete mode 100644 appium/tests/specs/mock/setup/DisallowAttesterSearchForDomains.spec.ts create mode 100644 appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPreDomainBasic.spec.ts diff --git a/appium/tests/screenobjects/mail-folder.screen.ts b/appium/tests/screenobjects/mail-folder.screen.ts index 0b55d448a..f8c3c30fb 100644 --- a/appium/tests/screenobjects/mail-folder.screen.ts +++ b/appium/tests/screenobjects/mail-folder.screen.ts @@ -74,12 +74,12 @@ class MailFolderScreen extends BaseScreen { } clickCreateEmail = async () => { - const elem = await this.createEmailButton; - if ((await elem.isDisplayed()) !== true) { - await TouchHelper.scrollDownToElement(elem); - await elem.waitForDisplayed(); + await browser.pause(2000); // todo: loading inbox. Fix this: wait until loader gone + if (await (await this.createEmailButton).isDisplayed() !== true) { + await TouchHelper.scrollDownToElement(await this.createEmailButton); + await (await this.createEmailButton).waitForDisplayed(); } - await ElementHelper.waitAndClick(elem); + await ElementHelper.waitAndClick(await this.createEmailButton, 1000); // delay needed on M1 } clickOnUserEmail = async (email: string) => { diff --git a/appium/tests/screenobjects/new-message.screen.ts b/appium/tests/screenobjects/new-message.screen.ts index b5ca6cc14..f2f569ac5 100644 --- a/appium/tests/screenobjects/new-message.screen.ts +++ b/appium/tests/screenobjects/new-message.screen.ts @@ -124,7 +124,13 @@ class NewMessageScreen extends BaseScreen { const addedRecipientEl = await this.addedRecipientEmail; const value = await addedRecipientEl.getValue(); expect(value).toEqual(` ${recipient} `); - }; + } + + checkAddedRecipientColor = async (recipient: string, order: number, color: string) => { + const addedRecipientEl = await $(`~aid-to-${order}-${color}`); + const name = await addedRecipientEl.getValue(); + expect(name).toEqual(` ${recipient} `); + } checkAddedAttachment = async (name: string) => { await (await this.deleteAttachmentButton).waitForDisplayed(); diff --git a/appium/tests/specs/mock/setup/CannotFindEmailOnAttester.spec.ts b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts similarity index 86% rename from appium/tests/specs/mock/setup/CannotFindEmailOnAttester.spec.ts rename to appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts index 0a6fd0aca..1e3474e56 100644 --- a/appium/tests/specs/mock/setup/CannotFindEmailOnAttester.spec.ts +++ b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts @@ -9,7 +9,7 @@ import NewMessageScreen from "../../../screenobjects/new-message.screen"; describe('SETUP: ', () => { - it('Cannot find email on attester', async () => { + it('cannot find email on attester with disallow_attester_search_for_domains=*', async () => { const mockApi = new MockApi(); @@ -24,6 +24,7 @@ describe('SETUP: ', () => { await MailFolderScreen.checkInboxScreen(); await MailFolderScreen.clickCreateEmail(); await NewMessageScreen.setAddRecipient('available.on@attester.test'); + await NewMessageScreen.checkAddedRecipientColor('available.on@attester.test', 0, 'gray'); }); }); }); diff --git a/appium/tests/specs/mock/setup/DisallowAttesterSearchForDomains.spec.ts b/appium/tests/specs/mock/setup/DisallowAttesterSearchForDomains.spec.ts deleted file mode 100644 index 61e26f2c4..000000000 --- a/appium/tests/specs/mock/setup/DisallowAttesterSearchForDomains.spec.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { MockApi } from 'api-mocks/mock'; -import { - SplashScreen, -} from '../../../screenobjects/all-screens'; -import {attesterPublicKeySamples} from "../../../../api-mocks/apis/attester/attester-endpoints"; -import SetupKeyScreen from "../../../screenobjects/setup-key.screen"; -import MailFolderScreen from "../../../screenobjects/mail-folder.screen"; -import NewMessageScreen from "../../../screenobjects/new-message.screen"; - -describe('SETUP: ', () => { - - it('Disallow attester search for domains', async () => { - - const mockApi = new MockApi(); - mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], key_manager_url: "https://ekm.flowcrypt.com", disallow_attester_search_for_domains: ["disabled.test"]}}; - mockApi.attesterConfig = {servedPubkeys: {'attester@disabled.test': attesterPublicKeySamples.valid, 'attester@enabled.test': attesterPublicKeySamples.valid}}; - - await mockApi.withMockedApis(async () => { - await SplashScreen.login(); - await SetupKeyScreen.setPassPhrase(); - await MailFolderScreen.checkInboxScreen(); - await MailFolderScreen.clickCreateEmail(); - - // Searching for recipients - await NewMessageScreen.setAddRecipient('attester@disabled.test'); - await NewMessageScreen.setAddRecipient('attester@enabled.test'); - - }); - }); -}); diff --git a/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts b/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts index 4b2bf9a8b..07dd662cc 100644 --- a/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts +++ b/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts @@ -9,20 +9,18 @@ import NewMessageScreen from "../../../screenobjects/new-message.screen"; describe('SETUP: ', () => { - it('Can find email on attester', async () => { - - const mockApi = new MockApi(); - - mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", - "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], key_manager_url: "https://ekm.flowcrypt.com"}}; - mockApi.attesterConfig = { servedPubkeys: {'available.on@attester.test': attesterPublicKeySamples.valid}}; - - await mockApi.withMockedApis(async () => { - await SplashScreen.login(); - await SetupKeyScreen.setPassPhrase(); - await MailFolderScreen.checkInboxScreen(); - await MailFolderScreen.clickCreateEmail(); - await NewMessageScreen.setAddRecipient('available.on@attester.test'); - }); + it('can find email on attester', async () => { + const mockApi = new MockApi(); + mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", + "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], key_manager_url: "https://ekm.flowcrypt.com"}}; + mockApi.attesterConfig = { servedPubkeys: {'available.on@attester.test': attesterPublicKeySamples.valid}}; + await mockApi.withMockedApis(async () => { + await SplashScreen.login(); + await SetupKeyScreen.setPassPhrase(); + await MailFolderScreen.checkInboxScreen(); + await MailFolderScreen.clickCreateEmail(); + await NewMessageScreen.setAddRecipient('available.on@attester.test'); + await NewMessageScreen.checkAddedRecipientColor('available.on@attester.test', 0, 'green'); }); + }); }); diff --git a/appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPreDomainBasic.spec.ts b/appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPreDomainBasic.spec.ts new file mode 100644 index 000000000..9e3780b6a --- /dev/null +++ b/appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPreDomainBasic.spec.ts @@ -0,0 +1,33 @@ +import { MockApi } from 'api-mocks/mock'; +import { + SplashScreen, +} from '../../../screenobjects/all-screens'; +import {attesterPublicKeySamples} from "../../../../api-mocks/apis/attester/attester-endpoints"; +import SetupKeyScreen from "../../../screenobjects/setup-key.screen"; +import MailFolderScreen from "../../../screenobjects/mail-folder.screen"; +import NewMessageScreen from "../../../screenobjects/new-message.screen"; + +describe('SETUP: ', () => { + + it('respects disallow_attester_search_for_domains on a per-domain basis', async () => { + + const mockApi = new MockApi(); + mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], key_manager_url: "https://ekm.flowcrypt.com", disallow_attester_search_for_domains: ["disabled.test"]}}; + mockApi.attesterConfig = {servedPubkeys: {'attester@disabled.test': attesterPublicKeySamples.valid, 'attester@enabled.test': attesterPublicKeySamples.valid}}; + + await mockApi.withMockedApis(async () => { + await SplashScreen.login(); + await SetupKeyScreen.setPassPhrase(); + await MailFolderScreen.checkInboxScreen(); + await MailFolderScreen.clickCreateEmail(); + + // Adding recipients + await NewMessageScreen.setAddRecipient('attester@disabled.test'); + await NewMessageScreen.setAddRecipient('attester@enabled.test'); + + // Checking added recipients color + await NewMessageScreen.checkAddedRecipientColor('attester@disabled.test', 0, 'gray'); + await NewMessageScreen.checkAddedRecipientColor('attester@enabled.test', 1, 'green'); + }); + }); +}); From b9eac872bf1cf1114e16c39e9b9afde187529951 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Tue, 14 Dec 2021 16:19:48 +0200 Subject: [PATCH 3/3] added fixes after review --- .../tests/screenobjects/mail-folder.screen.ts | 10 +++--- ...ithDisallowAttesterSearchForDomain.spec.ts | 36 +++++++++++-------- .../mock/setup/FindEmailOnAttester.spec.ts | 14 ++++++-- ...rSearchForDomainsOnPerDomainBasic.spec.ts} | 15 ++++++-- ...ithInconsistentClientConfiguration.spec.ts | 6 +++- .../SetupShowsMeaningfulErrorFromFES.spec.ts | 7 +++- 6 files changed, 62 insertions(+), 26 deletions(-) rename appium/tests/specs/mock/setup/{RespectsDisallowAttesterSearchForDomainsOnPreDomainBasic.spec.ts => RespectsDisallowAttesterSearchForDomainsOnPerDomainBasic.spec.ts} (70%) diff --git a/appium/tests/screenobjects/mail-folder.screen.ts b/appium/tests/screenobjects/mail-folder.screen.ts index f8c3c30fb..0b55d448a 100644 --- a/appium/tests/screenobjects/mail-folder.screen.ts +++ b/appium/tests/screenobjects/mail-folder.screen.ts @@ -74,12 +74,12 @@ class MailFolderScreen extends BaseScreen { } clickCreateEmail = async () => { - await browser.pause(2000); // todo: loading inbox. Fix this: wait until loader gone - if (await (await this.createEmailButton).isDisplayed() !== true) { - await TouchHelper.scrollDownToElement(await this.createEmailButton); - await (await this.createEmailButton).waitForDisplayed(); + const elem = await this.createEmailButton; + if ((await elem.isDisplayed()) !== true) { + await TouchHelper.scrollDownToElement(elem); + await elem.waitForDisplayed(); } - await ElementHelper.waitAndClick(await this.createEmailButton, 1000); // delay needed on M1 + await ElementHelper.waitAndClick(elem); } clickOnUserEmail = async (email: string) => { diff --git a/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts index 1e3474e56..86811cc76 100644 --- a/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts +++ b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts @@ -9,22 +9,30 @@ import NewMessageScreen from "../../../screenobjects/new-message.screen"; describe('SETUP: ', () => { - it('cannot find email on attester with disallow_attester_search_for_domains=*', async () => { + it('cannot find email on attester with disallow_attester_search_for_domains=*', async () => { - const mockApi = new MockApi(); + const mockApi = new MockApi(); - mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", - "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], - key_manager_url: "https://ekm.flowcrypt.com", disallow_attester_search_for_domains: ["*"]}}; - mockApi.attesterConfig = {servedPubkeys: {'available.on@attester.test': attesterPublicKeySamples.valid}}; + mockApi.fesConfig = { + clientConfiguration: { + flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], + key_manager_url: "https://ekm.flowcrypt.com", + disallow_attester_search_for_domains: ["*"] + } + }; + mockApi.attesterConfig = { + servedPubkeys: { + 'available.on@attester.test': attesterPublicKeySamples.valid + } + }; - await mockApi.withMockedApis(async () => { - await SplashScreen.login(); - await SetupKeyScreen.setPassPhrase(); - await MailFolderScreen.checkInboxScreen(); - await MailFolderScreen.clickCreateEmail(); - await NewMessageScreen.setAddRecipient('available.on@attester.test'); - await NewMessageScreen.checkAddedRecipientColor('available.on@attester.test', 0, 'gray'); - }); + await mockApi.withMockedApis(async () => { + await SplashScreen.login(); + await SetupKeyScreen.setPassPhrase(); + await MailFolderScreen.checkInboxScreen(); + await MailFolderScreen.clickCreateEmail(); + await NewMessageScreen.setAddRecipient('available.on@attester.test'); + await NewMessageScreen.checkAddedRecipientColor('available.on@attester.test', 0, 'gray'); }); + }); }); diff --git a/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts b/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts index 07dd662cc..a1d59988f 100644 --- a/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts +++ b/appium/tests/specs/mock/setup/FindEmailOnAttester.spec.ts @@ -11,9 +11,17 @@ describe('SETUP: ', () => { it('can find email on attester', async () => { const mockApi = new MockApi(); - mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", - "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], key_manager_url: "https://ekm.flowcrypt.com"}}; - mockApi.attesterConfig = { servedPubkeys: {'available.on@attester.test': attesterPublicKeySamples.valid}}; + mockApi.fesConfig = { + clientConfiguration: { + flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], + key_manager_url: "https://ekm.flowcrypt.com" + } + }; + mockApi.attesterConfig = { + servedPubkeys: { + 'available.on@attester.test': attesterPublicKeySamples.valid + } + }; await mockApi.withMockedApis(async () => { await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); diff --git a/appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPreDomainBasic.spec.ts b/appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPerDomainBasic.spec.ts similarity index 70% rename from appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPreDomainBasic.spec.ts rename to appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPerDomainBasic.spec.ts index 9e3780b6a..6d1ba49cb 100644 --- a/appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPreDomainBasic.spec.ts +++ b/appium/tests/specs/mock/setup/RespectsDisallowAttesterSearchForDomainsOnPerDomainBasic.spec.ts @@ -12,8 +12,19 @@ describe('SETUP: ', () => { it('respects disallow_attester_search_for_domains on a per-domain basis', async () => { const mockApi = new MockApi(); - mockApi.fesConfig = { clientConfiguration: {flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], key_manager_url: "https://ekm.flowcrypt.com", disallow_attester_search_for_domains: ["disabled.test"]}}; - mockApi.attesterConfig = {servedPubkeys: {'attester@disabled.test': attesterPublicKeySamples.valid, 'attester@enabled.test': attesterPublicKeySamples.valid}}; + mockApi.fesConfig = { + clientConfiguration: { + flags: ["NO_PRV_CREATE", "NO_PRV_BACKUP", "NO_ATTESTER_SUBMIT", "PRV_AUTOIMPORT_OR_AUTOGEN", "FORBID_STORING_PASS_PHRASE"], + key_manager_url: "https://ekm.flowcrypt.com", + disallow_attester_search_for_domains: ["disabled.test"] + } + }; + mockApi.attesterConfig = { + servedPubkeys: { + 'attester@disabled.test': attesterPublicKeySamples.valid, + 'attester@enabled.test': attesterPublicKeySamples.valid + } + }; await mockApi.withMockedApis(async () => { await SplashScreen.login(); diff --git a/appium/tests/specs/mock/setup/SetupFailsWithInconsistentClientConfiguration.spec.ts b/appium/tests/specs/mock/setup/SetupFailsWithInconsistentClientConfiguration.spec.ts index 7d8b8863e..b523d5ab7 100644 --- a/appium/tests/specs/mock/setup/SetupFailsWithInconsistentClientConfiguration.spec.ts +++ b/appium/tests/specs/mock/setup/SetupFailsWithInconsistentClientConfiguration.spec.ts @@ -9,7 +9,11 @@ describe('SETUP: ', () => { it('app setup fails with bad EKM URL', async () => { const mockApi = new MockApi(); - mockApi.fesConfig = { clientConfiguration: { key_manager_url: 'INTENTIONAL BAD URL' } }; + mockApi.fesConfig = { + clientConfiguration: { + key_manager_url: 'INTENTIONAL BAD URL' + } + }; await mockApi.withMockedApis(async () => { await SplashScreen.login(); await BaseScreen.checkErrorModal('Please check if key manager url set correctly'); diff --git a/appium/tests/specs/mock/setup/SetupShowsMeaningfulErrorFromFES.spec.ts b/appium/tests/specs/mock/setup/SetupShowsMeaningfulErrorFromFES.spec.ts index a1f351239..d9a8a8317 100644 --- a/appium/tests/specs/mock/setup/SetupShowsMeaningfulErrorFromFES.spec.ts +++ b/appium/tests/specs/mock/setup/SetupShowsMeaningfulErrorFromFES.spec.ts @@ -9,7 +9,12 @@ describe('SETUP: ', () => { it('setup shows meaningful error when FES returns 400', async () => { const mockApi = new MockApi(); - mockApi.fesConfig = { returnError: { code: 400, message: "some client err" } }; + mockApi.fesConfig = { + returnError: { + code: 400, + message: "some client err" + } + }; await mockApi.withMockedApis(async () => { await SplashScreen.login(); await BaseScreen.checkErrorModalForFES('EnterpriseServerApi 400 message:some client err get http://127.0.0.1:8001/fes/api/');