PRO-17116 fix: use navigationTimeout for reloadPage action

Author: uid11

autotests/actions/setPageCookiesAndNavigateToUrl.ts

@@ -4,12 +4,17 @@ import {getHeaderValue, log, replaceSetCookie} from 'e2ed/utils';
 
 import type {Cookie, NavigationReturn, SetCookieHeaderString, StringHeaders, Url} from 'e2ed/types';
 
+type Options = Readonly<{
+  pageCookies: readonly Cookie[];
+  timeout?: number;
+}>;
+
 /**
  * Navigates to the url and set custom page cookies.
  */
 export const setPageCookiesAndNavigateToUrl = (
   url: Url,
-  pageCookies: readonly Cookie[],
+  {pageCookies, timeout}: Options,
 ): Promise<NavigationReturn> => {
   const mapResponseHeaders = (headers: StringHeaders): StringHeaders => {
     const setCookies = getHeaderValue(headers, 'set-cookie');
@@ -28,5 +33,9 @@ export const setPageCookiesAndNavigateToUrl = (
 
   log(`Navigate to ${url} and set page cookie`, {pageCookies, url}, LogEventType.Action);
 
-  return setHeadersAndNavigateToUrl(url, {mapResponseHeaders});
+  return setHeadersAndNavigateToUrl(
+    url,
+    {mapResponseHeaders},
+    timeout !== undefined ? {timeout} : undefined,
+  );
 };

autotests/actions/setPageRequestHeadersAndNavigateToUrl.ts

@@ -4,12 +4,17 @@ import {log} from 'e2ed/utils';
 
 import type {NavigationReturn, StringHeaders, Url} from 'e2ed/types';
 
+type Options = Readonly<{
+  pageRequestHeaders: StringHeaders;
+  timeout?: number;
+}>;
+
 /**
  * Navigates to the url and set additional page request headers.
  */
 export const setPageRequestHeadersAndNavigateToUrl = (
   url: Url,
-  pageRequestHeaders: StringHeaders,
+  {pageRequestHeaders, timeout}: Options,
 ): Promise<NavigationReturn> => {
   const mapRequestHeaders = (): StringHeaders => pageRequestHeaders;
 
@@ -19,5 +24,9 @@ export const setPageRequestHeadersAndNavigateToUrl = (
     LogEventType.Action,
   );
 
-  return setHeadersAndNavigateToUrl(url, {mapRequestHeaders});
+  return setHeadersAndNavigateToUrl(
+    url,
+    {mapRequestHeaders},
+    timeout !== undefined ? {timeout} : undefined,
+  );
 };

autotests/pageObjects/pages/E2edReportExample/E2edReportExample.ts

@@ -122,10 +122,16 @@ export class E2edReportExample extends Page<CustomPageParams> {
 
   override navigateToPage(url: Url): Promise<NavigationReturn> {
     if (this.pageRequestHeaders) {
-      return setPageRequestHeadersAndNavigateToUrl(url, this.pageRequestHeaders);
+      return setPageRequestHeadersAndNavigateToUrl(url, {
+        pageRequestHeaders: this.pageRequestHeaders,
+        timeout: E2edReportExample.navigationTimeout,
+      });
     }
 
-    return setPageCookiesAndNavigateToUrl(url, this.pageCookies);
+    return setPageCookiesAndNavigateToUrl(url, {
+      pageCookies: this.pageCookies,
+      timeout: E2edReportExample.navigationTimeout,
+    });
   }
 
   override async waitForPageLoaded(): Promise<void> {

autotests/tests/main/exists.ts

@@ -20,7 +20,7 @@ import {assertFunctionThrows, getDocumentUrl} from 'e2ed/utils';
 import type {Url} from 'e2ed/types';
 
 // eslint-disable-next-line max-statements
-test('exists', {meta: {testId: '1'}, testIdleTimeout: 10_000, testTimeout: 20_000}, async () => {
+test('exists', {meta: {testId: '1'}, testIdleTimeout: 12_000, testTimeout: 20_000}, async () => {
   const language = 'en';
   const searchQuery = 'foo';
   const testScrollValue = 200;

src/Page.ts

@@ -167,6 +167,7 @@ export abstract class Page<PageParams = undefined> {
 
     await waitForAllRequestsComplete(() => true, {
       maxIntervalBetweenRequestsInMs: this.maxIntervalBetweenRequestsInMs,
+      timeout: (this.constructor as typeof Page).navigationTimeout,
     });
   }
 

src/actions/pages/reloadPage.ts

@@ -1,4 +1,4 @@
-import {LogEventType} from '../../constants/internal';
+import {ADDITIONAL_STEP_TIMEOUT, LogEventType} from '../../constants/internal';
 import {step} from '../../step';
 
 import type {AnyPageClassType} from '../../types/internal';
@@ -18,5 +18,8 @@ export const reloadPage = (page: InstanceType<AnyPageClassType>): Promise<void>
 
       await page.afterReloadPage?.();
     },
-    {type: LogEventType.InternalAction},
+    {
+      timeout: (page.constructor as AnyPageClassType).navigationTimeout + ADDITIONAL_STEP_TIMEOUT,
+      type: LogEventType.InternalAction,
+    },
   );