diff --git a/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts b/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts index 9d2b117a7044..4ac7995b914f 100644 --- a/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts +++ b/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts @@ -2,6 +2,7 @@ import Config from 'react-native-config'; import E2ELogin from '@libs/E2E/actions/e2eLogin'; import waitForAppLoaded from '@libs/E2E/actions/waitForAppLoaded'; import E2EClient from '@libs/E2E/client'; +import getPromiseWithResolve from '@libs/E2E/utils/getPromiseWithResolve'; import Navigation from '@libs/Navigation/Navigation'; import Performance from '@libs/Performance'; import CONST from '@src/CONST'; @@ -21,6 +22,15 @@ const test = () => { console.debug('[E2E] Logged in, getting chat finder metrics and submitting them…'); + const [openSearchPagePromise, openSearchPageResolve] = getPromiseWithResolve(); + const [loadSearchOptionsPromise, loadSearchOptionsResolve] = getPromiseWithResolve(); + + Promise.all([openSearchPagePromise, loadSearchOptionsPromise]).then(() => { + console.debug(`[E2E] Submitting!`); + + E2EClient.submitTestDone(); + }); + Performance.subscribeToMeasurements((entry) => { if (entry.name === CONST.TIMING.SIDEBAR_LOADED) { console.debug(`[E2E] Sidebar loaded, navigating to chat finder route…`); @@ -29,23 +39,38 @@ const test = () => { } console.debug(`[E2E] Entry: ${JSON.stringify(entry)}`); - if (entry.name !== CONST.TIMING.CHAT_FINDER_RENDER) { - return; + + if (entry.name === CONST.TIMING.CHAT_FINDER_RENDER) { + E2EClient.submitTestResults({ + branch: Config.E2E_BRANCH, + name: 'Open Chat Finder Page TTI', + duration: entry.duration, + }) + .then(() => { + openSearchPageResolve(); + console.debug('[E2E] Done with search, exiting…'); + }) + .catch((err) => { + console.debug('[E2E] Error while submitting test results:', err); + }); } - console.debug(`[E2E] Submitting!`); - E2EClient.submitTestResults({ - branch: Config.E2E_BRANCH, - name: 'Open Chat Finder Page TTI', - duration: entry.duration, - }) - .then(() => { - console.debug('[E2E] Done with search, exiting…'); - E2EClient.submitTestDone(); + if (entry.name === CONST.TIMING.LOAD_SEARCH_OPTIONS) { + E2EClient.submitTestResults({ + branch: Config.E2E_BRANCH, + name: 'Load Search Options', + duration: entry.duration, }) - .catch((err) => { - console.debug('[E2E] Error while submitting test results:', err); - }); + .then(() => { + loadSearchOptionsResolve(); + console.debug('[E2E] Done with loading search options, exiting…'); + }) + .catch((err) => { + console.debug('[E2E] Error while submitting test results:', err); + }); + } + + console.debug(`[E2E] Submitting!`); }); }); };