Merge pull request #117 from joomcode/fix/waitForRequest-context

feat: support switching tabs in all network actions

Author: uid11

.eslintrc.yaml

@@ -90,7 +90,6 @@ rules:
         - src/config.ts
         - src/createLocator.ts
         - src/getModulesGraph.ts
-        - src/globby.ts
         - src/index.ts
       missingExports: true
       unusedExports: true
@@ -193,7 +192,7 @@ rules:
   '@typescript-eslint/no-loop-func': error
   '@typescript-eslint/no-magic-numbers':
     - error
-    - ignore: [-2, -1, 0, 1, 2, 1024]
+    - ignore: [-2, -1, 0, 1, 2, 1000, 1024]
       ignoreArrayIndexes: true
       ignoreDefaultValues: true
       ignoreEnums: true

.github/workflows/ci.yaml

@@ -39,6 +39,7 @@ jobs:
       - run: npm run build
       - run: npm run test:local
       - uses: actions/upload-artifact@v4
+        if: ${{ always() }}
         with:
           name: reports
           path: build/autotests/reports

README.md

@@ -18,7 +18,7 @@ After the run, a detailed HTML report and a summary lite report in JSON format a
 
 ## Adding e2ed to a project
 
-Prerequisites: [node](https://nodejs.org/en/) >=20,
+Prerequisites: [node](https://nodejs.org/en/) >=22,
 [TypeScript](https://www.typescriptlang.org/) >=5.
 
 All commands below are run from the root directory of the project.
@@ -365,7 +365,7 @@ You can define the `SkipTests` type and `skipTests` processing rules in the hook
 at the time of the test error, for display in the HTML report.
 
 `testFileGlobs: readonly string[]`: an array of globs with pack test (task) files.
-https://www.npmjs.com/package/globby is used for matching globs.
+`fs.glob` from `nodejs` is used for matching globs.
 
 `testIdleTimeout: number`: timeout (in milliseconds) for each individual test step.
 If the test step (interval between two `log` function calls) takes longer than this timeout,

autotests/entities/device.ts

@@ -16,6 +16,7 @@ export const createDevice = async ({
     cookies,
     input: 7,
     model,
+    title: model,
     version,
   });
 

autotests/entities/product.ts

@@ -8,11 +8,12 @@ import type {ClientFunction} from 'e2ed/types';
  */
 export const addProduct: ClientFunction<[Product], Promise<ApiProduct>> = createClientFunction(
   (product: Product) =>
-    fetch(`https://reqres.in/api/product/${product.id}?size=${product.size}`, {
+    fetch(`https://dummyjson.com/products/add?id=${product.id}&size=${product.size}`, {
       body: JSON.stringify({
         cookies: [],
         input: product.input,
         model: product.model,
+        title: product.model,
         version: product.version,
       }),
       headers: {'Content-Type': 'application/json; charset=UTF-8'},

autotests/entities/worker.ts

@@ -4,30 +4,52 @@ import {log} from 'e2ed/utils';
 import type {UserWorker} from 'autotests/types';
 import type {ClientFunction} from 'e2ed/types';
 
-const clientGetUsers = createClientFunction(
-  (delay: number) =>
-    fetch(`https://reqres.in/api/users?delay=${delay}`, {method: 'GET'}).then((res) => res.json()),
-  {name: 'getUsers', timeout: 6_000},
-);
+type GetUsersOptions = Readonly<{delay?: number; retries?: number}> | undefined;
+
+let clientGetUsers: ClientFunction<[number], unknown> | undefined;
+let clientGetUsersRetries: number | undefined;
 
 /**
  * Adds user-worker.
  */
-export const addUser: ClientFunction<[UserWorker, number?], Promise<object>> = createClientFunction(
-  (user: UserWorker, delay?: number) =>
-    fetch(`https://reqres.in/api/users${delay !== undefined ? `?delay=${delay}` : ''}`, {
+export const addUser: ClientFunction<
+  [Readonly<{delay?: number; user: UserWorker}>],
+  Promise<object>
+> = createClientFunction(
+  ({delay, user}) =>
+    fetch(`https://dummyjson.com/users/add${delay !== undefined ? `?delay=${delay}` : ''}`, {
       body: JSON.stringify(user),
       headers: {'Content-Type': 'application/json; charset=UTF-8'},
       method: 'POST',
-    }),
+    })
+      .then((res) => res.json())
+      .then((result: UserWorker) => {
+        // eslint-disable-next-line no-console
+        console.log('addUser return', result);
+
+        return result;
+      }),
+
   {name: 'addUser', timeout: 3_000},
 );
 
 /**
  * Get list of user-workers.
  */
-export const getUsers = (delay: number): Promise<unknown> => {
+export const getUsers = ({delay = 0, retries = 0}: GetUsersOptions = {}): Promise<unknown> => {
   log(`Send API request with delay = ${delay}s`);
 
+  if (clientGetUsers === undefined || clientGetUsersRetries !== retries) {
+    clientGetUsersRetries = retries;
+
+    clientGetUsers = createClientFunction(
+      (clientDelay: number) =>
+        fetch(`https://dummyjson.com/users?delay=${clientDelay}`, {method: 'GET'}).then(
+          (res) => res.json() as unknown,
+        ),
+      {name: 'getUsers', retries, timeout: 6_000},
+    );
+  }
+
   return clientGetUsers(delay);
 };

autotests/fixtures/fullMocks/mr-iHTD7Lp.json

@@ -0,0 +1 @@
+{"/products/add":[{"completionTimeInMs":1747533319483,"duration":"3ms","request":{"method":"POST","query":{"id":"135865","size":"13"},"requestBody":{"cookies":[],"input":17,"model":"samsung","title":"samsung","version":"12"},"requestHeaders":{"accept":"*/*","accept-language":"en-US","content-type":"application/json; charset=UTF-8","referer":"https://joomcode.github.io/","user-agent":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36","sec-ch-ua":"\"Chromium\";v=\"134\", \"Not:A-Brand\";v=\"24\", \"HeadlessChrome\";v=\"134\"","sec-ch-ua-mobile":"?0","sec-ch-ua-platform":"\"Linux\""},"url":"https://dummyjson.com/products/add?id=135865&size=13","utcTimeInMs":1747533319480},"responseBody":{"id":135865,"method":"POST","output":"17","payload":{"id":"135865","cookies":[],"input":17,"model":"samsung","title":"samsung","version":"12"},"query":{"id":"135865","size":"13"},"url":"https://dummyjson.com/products/add?id=135865&size=13"},"responseHeaders":{"content-type":"application/json; charset=UTF-8","content-length":"241"},"statusCode":200},{"completionTimeInMs":1747533319780,"duration":"3ms","request":{"method":"POST","query":{"id":"135865","size":"13"},"requestBody":{"cookies":[],"input":17,"model":"samsung","title":"samsung","version":"12"},"requestHeaders":{"accept":"*/*","accept-language":"en-US","content-type":"application/json; charset=UTF-8","referer":"https://joomcode.github.io/","user-agent":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36","sec-ch-ua":"\"Chromium\";v=\"134\", \"Not:A-Brand\";v=\"24\", \"HeadlessChrome\";v=\"134\"","sec-ch-ua-mobile":"?0","sec-ch-ua-platform":"\"Linux\""},"url":"https://dummyjson.com/products/add?id=135865&size=13","utcTimeInMs":1747533319777},"responseBody":{"id":195,"title":"samsung"},"responseHeaders":{"etag":"W/\"1c-hP2nNXEenyGq06xPgJ9a0RJCH9E\"","x-content-type-options":"nosniff","date":"Sun, 18 May 2025 01:55:19 GMT","content-type":"application/json; charset=utf-8","vary":"Accept-Encoding","x-frame-options":"SAMEORIGIN","strict-transport-security":"max-age=15552000; includeSubDomains","x-dns-prefetch-control":"off","x-ratelimit-reset":"1747533329","x-download-options":"noopen","x-ratelimit-remaining":"99","access-control-allow-origin":"*","content-length":"28","x-xss-protection":"1; mode=block","x-ratelimit-limit":"100","x-railway-request-id":"cHuLc3G1SFSKT7u4m3z_FQ","x-powered-by":"Cats on Keyboards","x-railway-edge":"railway/europe-west4-drams3a","server":"railway-edge"},"statusCode":201}]}

autotests/fixtures/fullMocks/nAsmmzYTv6.json

@@ -4,7 +4,7 @@ import {
 } from 'autotests/actions';
 import {setPageCookies, setPageRequestHeaders} from 'autotests/context';
 import {E2edReportExample as E2edReportExampleRoute} from 'autotests/routes/pageRoutes';
-import {createSelector, locator} from 'autotests/selectors';
+import {locator} from 'autotests/selectors';
 import {Page} from 'e2ed';
 import {setReadonlyProperty} from 'e2ed/utils';
 
@@ -23,7 +23,7 @@ export class E2edReportExample extends Page<CustomPageParams> {
   /**
    * Page header.
    */
-  readonly header: Selector = createSelector('.header');
+  readonly header: Selector = locator('header');
 
   /**
    * Navigation bar with test retries.

autotests/pageObjects/pages/E2edReportExample/E2edReportExample.ts

@@ -67,7 +67,9 @@ export class Main extends Page<CustomPageParams> {
     await waitForAllRequestsComplete(
       ({url}) => {
         if (
+          url.startsWith('https://browser.events.data.msn.com/') ||
           url.startsWith('https://img-s-msn-com.akamaized.net/') ||
+          url.startsWith('https://rewards.bing.com/widget/') ||
           url.startsWith('https://www.bing.com/th?id=')
         ) {
           return false;