@uuv/playwright 3.3.1 → 3.4.1

package/dist/cucumber/step_definitions/playwright/core-engine.d.ts

@@ -12,7 +12,8 @@
  * understanding English or French.
  */
 import { World } from "../../preprocessor/run/world";
-import { Cookie, Locator } from "playwright";
+import { Cookie } from "@playwright/test";
+import { Locator } from "playwright";
 export declare enum COOKIE_NAME {
     SELECTED_ELEMENT = "withinFocusedElement",
     MOCK_URL = "mockUrl"
@@ -28,19 +29,39 @@ export declare enum FILTER_TYPE {
     TEST_ID = "byTestId",
     SELECTOR_PARENT = "bySelectorParent"
 }
-export type MockType = {
-    name: any;
-    string: any;
-    url: any;
+export type CustomCookieValue = {
+    name: string;
 };
+export declare class CustomCookie implements Cookie {
+    name: string;
+    value: string;
+    domain: string;
+    expires: number;
+    httpOnly: boolean;
+    path: string;
+    sameSite: "Strict" | "Lax" | "None";
+    secure: boolean;
+    isValid(): boolean;
+}
+export declare class MockCookie implements CustomCookieValue {
+    name: string;
+    url: string;
+    verb: string;
+    isConsumed: boolean;
+    constructor(name: string, url: string, verb: string);
+}
+export declare class SelectedElementCookie implements CustomCookieValue {
+    name: string;
+    value: string;
+    constructor(name: string, value: string);
+}
 export type FilterType = {
     name: FILTER_TYPE;
     value: any;
 };
 export declare function getPageOrElement(world: World): Promise<any>;
-export declare function addCookieWhenValueIsList(world: World, cookieName: COOKIE_NAME, value: any): Promise<void>;
-export declare function getCookie(world: World, cookieName: COOKIE_NAME): Promise<Cookie>;
-export declare function deleteCookieByValue(world: World, cookieName: COOKIE_NAME, node: any): Promise<void>;
+export declare function addCookie(world: World, cookieName: COOKIE_NAME, newCookie: CustomCookieValue): Promise<void>;
+export declare function getCookie(world: World, cookieName: COOKIE_NAME): Promise<CustomCookie>;
 export declare function deleteCookieByName(world: World, cookieName: COOKIE_NAME): Promise<void>;
 export declare function findWithRoleAndName(world: World, role: string, name: string): Promise<any>;
 export declare function withinRoleAndName(world: World, role: string, name: string): Promise<void>;

package/dist/cucumber/step_definitions/playwright/core-engine.js

@@ -13,7 +13,7 @@
  * understanding English or French.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkTextContentLocator = exports.showAttributesInLocator = exports.findWithRoleAndNameAndContentEnable = exports.findWithRoleAndNameAndContentDisable = exports.findWithRoleAndNameFocused = exports.findWithRoleAndNameAndContent = exports.notFoundWithRoleAndName = exports.withinRoleAndName = exports.findWithRoleAndName = exports.deleteCookieByName = exports.deleteCookieByValue = exports.getCookie = exports.addCookieWhenValueIsList = exports.getPageOrElement = exports.FILTER_TYPE = exports.COOKIE_VALUE = exports.COOKIE_NAME = void 0;
+exports.checkTextContentLocator = exports.showAttributesInLocator = exports.findWithRoleAndNameAndContentEnable = exports.findWithRoleAndNameAndContentDisable = exports.findWithRoleAndNameFocused = exports.findWithRoleAndNameAndContent = exports.notFoundWithRoleAndName = exports.withinRoleAndName = exports.findWithRoleAndName = exports.deleteCookieByName = exports.getCookie = exports.addCookie = exports.getPageOrElement = exports.SelectedElementCookie = exports.MockCookie = exports.CustomCookie = exports.FILTER_TYPE = exports.COOKIE_VALUE = exports.COOKIE_NAME = void 0;
 const test_1 = require("@playwright/test");
 var COOKIE_NAME;
 (function (COOKIE_NAME) {
@@ -33,99 +33,126 @@ var FILTER_TYPE;
     FILTER_TYPE["TEST_ID"] = "byTestId";
     FILTER_TYPE["SELECTOR_PARENT"] = "bySelectorParent";
 })(FILTER_TYPE || (exports.FILTER_TYPE = FILTER_TYPE = {}));
+class CustomCookie {
+    name = `${COOKIE_VALUE.NOT_EXIST.toString()}`;
+    value = "[]";
+    domain = ".github.com";
+    expires = -1;
+    httpOnly = false;
+    path = "/";
+    sameSite = "Lax";
+    secure = false;
+    isValid() {
+        return !this.name.includes(COOKIE_VALUE.NOT_EXIST.toString());
+    }
+}
+exports.CustomCookie = CustomCookie;
+class MockCookie {
+    name;
+    url;
+    verb;
+    isConsumed = false;
+    constructor(name, url, verb) {
+        this.name = name;
+        this.url = url;
+        this.verb = verb;
+        this.isConsumed = false;
+    }
+}
+exports.MockCookie = MockCookie;
+class SelectedElementCookie {
+    name;
+    value;
+    constructor(name, value) {
+        this.name = name;
+        this.value = value;
+    }
+}
+exports.SelectedElementCookie = SelectedElementCookie;
 async function getPageOrElement(world) {
     let pointer = world.page;
-    await getCookie(world, COOKIE_NAME.SELECTED_ELEMENT).then(async (cookie) => {
-        // console.debug("cookieGetPageOrElement", cookie)
-        if (cookie.value !== COOKIE_VALUE.NOT_EXIST.toString()) {
-            const filters = JSON.parse(cookie.value);
-            // console.debug("filters",filters);
-            for (const filter of filters) {
-                switch (filter.name) {
-                    case FILTER_TYPE.SELECTOR:
-                        pointer = pointer.locator(filter.value);
-                        break;
-                    case FILTER_TYPE.ARIA_LABEL:
-                        pointer = pointer.getByLabel(filter.value, { exact: true });
-                        break;
-                    case FILTER_TYPE.ROLE:
-                        pointer = pointer.getByRole(filter.value, { includeHidden: true, exact: true });
-                        break;
-                    case FILTER_TYPE.TEST_ID:
-                        pointer = pointer.getByTestId(filter.value);
-                        break;
-                    case FILTER_TYPE.TEXT:
-                        pointer = pointer.getByText(filter.value, { exact: true });
-                        break;
-                    case FILTER_TYPE.SELECTOR_PARENT:
-                        pointer = pointer.locator(filter.value);
-                        break;
-                    default:
-                        break;
-                }
-                // console.debug("locatorGetPageOrElement", pointer, filter)
-                await (0, test_1.expect)(pointer).toHaveCount(1);
+    const cookie = await getCookie(world, COOKIE_NAME.SELECTED_ELEMENT);
+    // console.debug("cookieGetPageOrElement", cookie);
+    if (cookie.isValid()) {
+        const filters = JSON.parse(cookie.value);
+        // console.debug("filters",filters);
+        for (const filter of filters) {
+            switch (filter.name) {
+                case FILTER_TYPE.SELECTOR:
+                    pointer = pointer.locator(filter.value);
+                    break;
+                case FILTER_TYPE.ARIA_LABEL:
+                    pointer = pointer.getByLabel(filter.value, { exact: true });
+                    break;
+                case FILTER_TYPE.ROLE:
+                    pointer = pointer.getByRole(filter.value, { includeHidden: true, exact: true });
+                    break;
+                case FILTER_TYPE.TEST_ID:
+                    pointer = pointer.getByTestId(filter.value);
+                    break;
+                case FILTER_TYPE.TEXT:
+                    pointer = pointer.getByText(filter.value, { exact: true });
+                    break;
+                case FILTER_TYPE.SELECTOR_PARENT:
+                    pointer = pointer.locator(filter.value);
+                    break;
+                default:
+                    break;
             }
+            // console.debug("locatorGetPageOrElement", pointer, filter)
+            await (0, test_1.expect)(pointer).toHaveCount(1);
         }
-    });
+    }
     return pointer;
 }
 exports.getPageOrElement = getPageOrElement;
-async function addCookieWhenValueIsList(world, cookieName, value) {
+async function addCookie(world, cookieName, newCookie) {
     // console.debug("value", value)
     const cookieNameStr = `${cookieName.toString()}_${world.testInfo.testId}`;
     const cookie = await getCookie(world, cookieName);
-    if (cookie.value !== COOKIE_VALUE.NOT_EXIST.toString()) {
-        // console.debug("cookieValue", cookie.value);
-        const cookieValue = JSON.parse(cookie.value);
-        cookieValue.push(value);
-        // console.debug("cookieValueJSON", JSON.stringify(cookieValue));
-        await world.context.addCookies([{ name: cookieNameStr, value: JSON.stringify(cookieValue), path: "/", domain: ".github.com" }]);
-    }
-    else {
-        await world.context.addCookies([{ name: cookieNameStr, value: `[${JSON.stringify(value)}]`, path: "/", domain: ".github.com" }]);
+    let cookieValue = JSON.parse(cookie.value);
+    const mockCookie = cookieValue.find((cookie => cookie.name === newCookie.name));
+    switch (cookieName) {
+        case COOKIE_NAME.MOCK_URL:
+            if (mockCookie) {
+                cookieValue
+                    .filter((cookie => cookie.name === newCookie.name))
+                    .map((cookie => cookie.isConsumed = true));
+            }
+            else {
+                cookieValue = [];
+                cookieValue.push(newCookie);
+            }
+            // console.debug("cookieValueJSON", JSON.stringify(cookieValue));
+            break;
+        case COOKIE_NAME.SELECTED_ELEMENT:
+            cookieValue.push(newCookie);
+            break;
     }
+    await world.context.addCookies([{ name: cookieNameStr, value: JSON.stringify(cookieValue), path: "/", domain: ".github.com" }]);
 }
-exports.addCookieWhenValueIsList = addCookieWhenValueIsList;
+exports.addCookie = addCookie;
 async function getCookie(world, cookieName) {
     const cookieNameStr = `${cookieName.toString()}_${world.testInfo.testId}`;
-    let cookie = {
-        "name": cookieNameStr,
-        "value": COOKIE_VALUE.NOT_EXIST.toString(),
-        "domain": ".github.com",
-        "path": "/",
-    };
     const cookies = await world.context.cookies();
     if (cookies) {
-        const cookieInContext = await cookies.filter(cookie => cookie.name === cookieNameStr)[0];
+        const cookieInContext = cookies.filter(cookie => cookie.name === cookieNameStr)[0];
         // console.debug("selector", cookieInContext)
         if (cookieInContext) {
-            cookie = cookieInContext;
+            return Object.assign(new CustomCookie(), cookieInContext);
         }
     }
-    return cookie;
+    return new CustomCookie();
 }
 exports.getCookie = getCookie;
-async function deleteCookieByValue(world, cookieName, node) {
-    const filteredCookies = (await world.context
-        .cookies())
-        .map((cookie) => {
-        if (cookie.name === `${cookieName.toString()}_${world.testInfo.testId}`) {
-            const mocks = JSON.parse(cookie.value);
-            mocks.filter(mock => mock[0] !== node[0] && mock[1] !== node[1]);
-        }
-        return cookie;
-    });
-    await world.context.clearCookies();
-    await world.context.addCookies(filteredCookies);
-}
-exports.deleteCookieByValue = deleteCookieByValue;
 async function deleteCookieByName(world, cookieName) {
-    const filteredCookies = (await world.context
-        .cookies())
-        .filter((cookie) => cookie.name !== `${cookieName.toString()}_${world.testInfo.testId}`);
-    await world.context.clearCookies();
-    await world.context.addCookies(filteredCookies);
+    const cookieToDelete = await getCookie(world, cookieName);
+    await world.context.addCookies([
+        {
+            ...cookieToDelete,
+            expires: 0,
+        },
+    ]);
 }
 exports.deleteCookieByName = deleteCookieByName;
 async function findWithRoleAndName(world, role, name) {
@@ -134,12 +161,16 @@ async function findWithRoleAndName(world, role, name) {
 exports.findWithRoleAndName = findWithRoleAndName;
 async function withinRoleAndName(world, role, name) {
     await findWithRoleAndNameAndContent(world, role, name);
-    await addCookieWhenValueIsList(world, COOKIE_NAME.SELECTED_ELEMENT, { name: FILTER_TYPE.SELECTOR, value: `role=${role}[name="${name}"]` });
+    await addCookie(world, COOKIE_NAME.SELECTED_ELEMENT, new SelectedElementCookie(FILTER_TYPE.SELECTOR, `role=${role}[name="${name}"]`));
 }
 exports.withinRoleAndName = withinRoleAndName;
 async function notFoundWithRoleAndName(world, role, name) {
     role = encodeURIComponent(role);
-    await getPageOrElement(world).then(async (element) => await (0, test_1.expect)(element.getByRole(role, { name: name, includeHidden: true, exact: true })).toHaveCount(0));
+    await getPageOrElement(world).then(async (element) => await (0, test_1.expect)(element.getByRole(role, {
+        name: name,
+        includeHidden: true,
+        exact: true
+    })).toHaveCount(0));
 }
 exports.notFoundWithRoleAndName = notFoundWithRoleAndName;
 async function findWithRoleAndNameAndContent(world, expectedRole, name, expectedTextContent = undefined) {

package/dist/cucumber/step_definitions/playwright/generated/_en-generated-cucumber-steps-definition.js

@@ -22,8 +22,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const runner_commons_1 = require("@uuv/runner-commons");
 const axe_playwright_1 = require("axe-playwright");
 const test_1 = require("@playwright/test");
-const core_engine_1 = require("../core-engine");
 const cucumber_1 = require("@cucumber/cucumber");
+const core_engine_1 = require("../core-engine");
 const path_1 = __importDefault(require("path"));
 /**
  * Sets the viewport dimensions with one of the presets defined by your runtime engine as Cypress: [Link](https://docs.cypress.io/api/commands/viewport#Arguments) or Playwright: [Link](https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json)
@@ -81,20 +81,20 @@ const path_1 = __importDefault(require("path"));
 (0, cucumber_1.When)(`within the element with aria-label {string}`, async function (expectedAriaLabel) {
     const sanitizedExpectedAriaLabel = encodeURIComponent(expectedAriaLabel).replaceAll("%20", " ");
     await (0, core_engine_1.getPageOrElement)(this).then((element) => (0, test_1.expect)(element.getByLabel(sanitizedExpectedAriaLabel, { exact: true })).toHaveCount(1));
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, { name: core_engine_1.FILTER_TYPE.ARIA_LABEL, value: sanitizedExpectedAriaLabel });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, new core_engine_1.SelectedElementCookie(core_engine_1.FILTER_TYPE.ARIA_LABEL, sanitizedExpectedAriaLabel));
 });
 /**
  * Deletes selected element and timeout
  * */
 (0, cucumber_1.When)(`I reset context`, async function () {
-    await this.context.clearCookies();
+    await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
 });
 /**
  * Selects the element whose selector is specified <br />⚠ remember to deselect the element with <b>[I reset context](#i-reset-context)</b> if you're no longer acting on it
  * */
 (0, cucumber_1.When)(`within the element with selector {string}`, async function (selector) {
     await (0, core_engine_1.getPageOrElement)(this).then((element) => (0, test_1.expect)(element.locator(selector)).toHaveCount(1));
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, { name: core_engine_1.FILTER_TYPE.SELECTOR, value: selector });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, new core_engine_1.SelectedElementCookie(core_engine_1.FILTER_TYPE.SELECTOR, selector));
 });
 /**
  * Writes the sentence passed as a parameter (useful for example to fill in a form field).<br/>Make sure you've selected an element beforehand with the <strong>within...</strong> phrases.
@@ -156,35 +156,37 @@ const path_1 = __importDefault(require("path"));
 (0, cucumber_1.When)(`within the element with testId {string}`, async function (testId) {
     testId = encodeURIComponent(testId);
     await (0, core_engine_1.getPageOrElement)(this).then(async (element) => await (0, test_1.expect)(element.getByTestId(testId)).toHaveCount(1));
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, { name: core_engine_1.FILTER_TYPE.TEST_ID, value: testId });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, new core_engine_1.SelectedElementCookie(core_engine_1.FILTER_TYPE.TEST_ID, testId));
 });
 /**
  * Mock a named API response with body. <i>If you use Playwright as runtime engine, <b>request</b> and <b>named</b> are unused.</i>
  * */
 (0, cucumber_1.When)(`I mock a request {} on url {string} named {string} with content {}`, async function (verb, url, name, body) {
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.MOCK_URL, { name: name, url: url });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL, new core_engine_1.MockCookie(name, url, verb));
     await this.page.route(url, async (route) => {
-        const json = body;
-        await route.fulfill({ json });
+        await route.fulfill({ body });
+        await afterMock(this, url, verb, name);
     });
 });
 /**
  * Mock a named API response with status code
  * */
 (0, cucumber_1.When)(`I mock a request {} on url {string} named {string} with status code {int}`, async function (verb, url, name, statusCode) {
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.MOCK_URL, { name: name, url: url });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL, new core_engine_1.MockCookie(name, url, verb));
     await this.page.route(url, async (route) => {
         await route.fulfill({ status: statusCode });
+        await afterMock(this, url, verb, name);
     });
 });
 /**
  * Mock a named API response with file's extension .json, .js, .coffee, .html, .txt, .csv, .png, .jpg, .jpeg, .gif, .tif, .tiff, .zip
  * */
 (0, cucumber_1.When)(`I mock a request {} on url {string} named {string} with fixture {}`, async function (verb, url, name, fixture) {
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.MOCK_URL, { name: name, url: url });
-    const data = await runner_commons_1.fs.readFileSync(path_1.default.join(getConfigDir(), `playwright/fixtures/${fixture}`));
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL, new core_engine_1.MockCookie(name, url, verb));
+    const data = runner_commons_1.fs.readFileSync(path_1.default.join(getConfigDir(), `playwright/fixtures/${fixture}`), "utf8");
     await this.page.route(url, async (route) => {
         await route.fulfill({ body: data });
+        await afterMock(this, url, verb, name);
     });
 });
 /**
@@ -395,13 +397,20 @@ function getConfigDir() {
  * */
 (0, cucumber_1.Then)(`I should consume a mock named {string}`, async function (name) {
     const cookie = await (0, core_engine_1.getCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL);
-    const mockUrls = JSON.parse(cookie.value);
-    const mockUrl = mockUrls.find(mock => mock.name === name);
-    await (0, test_1.expect)(mockUrl).not.toBeUndefined();
-    const requestPromise = await this.page.waitForResponse(mockUrl?.url);
-    const request = await requestPromise;
-    await (0, core_engine_1.deleteCookieByValue)(this, core_engine_1.COOKIE_NAME.MOCK_URL, mockUrl);
-    // console.debug("request: ", request);
+    (0, test_1.expect)(() => {
+        if (!cookie.isValid()) {
+            throw new Error(`Mock ${name} must be defined before use this sentence`);
+        }
+    }).not.toThrow();
+    await test_1.expect.poll(async () => {
+        const cookie = await (0, core_engine_1.getCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL);
+        const mockUrls = JSON.parse(cookie.value);
+        const mockUrl = mockUrls.find(mock => mock.name === name);
+        if (mockUrl) {
+            return mockUrl?.isConsumed;
+        }
+        return false;
+    }).toBeDefined();
 });
 /**
  * Wait milliseconds. <b>Warning:</b> use this sentence <b>in production</b> can make your <b>test flaky</b>.
@@ -466,16 +475,32 @@ async function pressKey(world, key) {
             break;
     }
     await (0, core_engine_1.deleteCookieByName)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    await (0, core_engine_1.addCookieWhenValueIsList)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, { name: core_engine_1.FILTER_TYPE.SELECTOR_PARENT, value: "*:focus" });
+    await (0, core_engine_1.addCookie)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, new core_engine_1.SelectedElementCookie(core_engine_1.FILTER_TYPE.SELECTOR_PARENT, "*:focus"));
 }
 async function click(world, role, name) {
     await (0, core_engine_1.getPageOrElement)(world).then(async (element) => {
         const byRole = element.getByRole(role, { name: name, includeHidden: true, exact: true });
         await (0, test_1.expect)(byRole).toHaveCount(1);
         await byRole.click({ timeout: runner_commons_1.DEFAULT_TIMEOUT });
-        await world.context.clearCookies();
+        await world.page.waitForLoadState();
+        await (0, core_engine_1.deleteCookieByName)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     });
 }
 function keyBoardFocusTarget(world) {
     return world.page.locator(":focus");
 }
+async function setMockAsConsumed(name, mock, world) {
+    const newMockCookie = new core_engine_1.MockCookie(name, mock.url, mock.verb);
+    newMockCookie.isConsumed = true;
+    await (0, core_engine_1.addCookie)(world, core_engine_1.COOKIE_NAME.MOCK_URL, newMockCookie);
+}
+async function afterMock(world, url, verb, name) {
+    await world.page.waitForResponse(url);
+    const cookie = await (0, core_engine_1.getCookie)(world, core_engine_1.COOKIE_NAME.MOCK_URL);
+    const mockCookie = JSON.parse(cookie.value);
+    for (const mock of mockCookie) {
+        if (mock.name === name && mock.verb === verb && mock.url === url) {
+            await setMockAsConsumed(name, mock, world);
+        }
+    }
+}

package/dist/cucumber/step_definitions/playwright/generated/_fr-generated-cucumber-steps-definition.js

@@ -22,8 +22,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const runner_commons_1 = require("@uuv/runner-commons");
 const axe_playwright_1 = require("axe-playwright");
 const test_1 = require("@playwright/test");
-const core_engine_1 = require("../core-engine");
 const cucumber_1 = require("@cucumber/cucumber");
+const core_engine_1 = require("../core-engine");
 const path_1 = __importDefault(require("path"));
 /**
  * Configure les dimensions de la fenêtre avec à un des préréglages définit par le moteur d'exécution à savoir pour Cypress: [lien](https://docs.cypress.io/api/commands/viewport#Preset) et pour Playwright: [lien](https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/deviceDescriptorsSource.json)
@@ -81,20 +81,20 @@ const path_1 = __importDefault(require("path"));
 (0, cucumber_1.When)(`je vais à l'intérieur de l'élément ayant pour aria-label {string}`, async function (expectedAriaLabel) {
     const sanitizedExpectedAriaLabel = encodeURIComponent(expectedAriaLabel).replaceAll("%20", " ");
     await (0, core_engine_1.getPageOrElement)(this).then((element) => (0, test_1.expect)(element.getByLabel(sanitizedExpectedAriaLabel, { exact: true })).toHaveCount(1));
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, { name: core_engine_1.FILTER_TYPE.ARIA_LABEL, value: sanitizedExpectedAriaLabel });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, new core_engine_1.SelectedElementCookie(core_engine_1.FILTER_TYPE.ARIA_LABEL, sanitizedExpectedAriaLabel));
 });
 /**
  * Supprime l'élément sélectionné et le timeout du contexte
  * */
 (0, cucumber_1.When)(`je reinitialise le contexte`, async function () {
-    await this.context.clearCookies();
+    await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
 });
 /**
  * Sélectionne l'élément dont le sélecteur est spécifié <br />⚠ pensez à déselectionner l'élement avec <b>[je reinitialise le contexte](#je-reinitialise-le-contexte)</b> si vous n'agissez plus dessus
  * */
 (0, cucumber_1.When)(`je vais à l'intérieur de l'élément ayant pour sélecteur {string}`, async function (selector) {
     await (0, core_engine_1.getPageOrElement)(this).then((element) => (0, test_1.expect)(element.locator(selector)).toHaveCount(1));
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, { name: core_engine_1.FILTER_TYPE.SELECTOR, value: selector });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, new core_engine_1.SelectedElementCookie(core_engine_1.FILTER_TYPE.SELECTOR, selector));
 });
 /**
  * Saisit de la phrase passée en paramètre (utile par exemple pour remplir un champ de formulaire).<br/>Assurez vous d'avoir effectué une sélection d'élément avant avec les phrases <strong>Je vais à l'intérieur...</strong>.
@@ -156,35 +156,37 @@ const path_1 = __importDefault(require("path"));
 (0, cucumber_1.When)(`je vais à l'intérieur de l'élément ayant pour testId {string}`, async function (testId) {
     testId = encodeURIComponent(testId);
     await (0, core_engine_1.getPageOrElement)(this).then(async (element) => await (0, test_1.expect)(element.getByTestId(testId)).toHaveCount(1));
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, { name: core_engine_1.FILTER_TYPE.TEST_ID, value: testId });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, new core_engine_1.SelectedElementCookie(core_engine_1.FILTER_TYPE.TEST_ID, testId));
 });
 /**
  * Simule une réponse d'API avec un contenu spécifique. <i>Si vous utilisez Playwright comme moteur d'exécution, les attributs <b>méthode de requête</b> et <b>nom</b> ne sont pas utilisés.</i>
  * */
 (0, cucumber_1.When)(`je simule une requête {} sur l'url {string} nommée {string} avec le contenu suivant {}`, async function (verb, url, name, body) {
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.MOCK_URL, { name: name, url: url });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL, new core_engine_1.MockCookie(name, url, verb));
     await this.page.route(url, async (route) => {
-        const json = body;
-        await route.fulfill({ json });
+        await route.fulfill({ body });
+        await afterMock(this, url, verb, name);
     });
 });
 /**
  * Simule une réponse d'API avec un code http spécifique
  * */
 (0, cucumber_1.When)(`je simule une requête {} sur l'url {string} nommée {string} avec le code http {int}`, async function (verb, url, name, statusCode) {
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.MOCK_URL, { name: name, url: url });
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL, new core_engine_1.MockCookie(name, url, verb));
     await this.page.route(url, async (route) => {
         await route.fulfill({ status: statusCode });
+        await afterMock(this, url, verb, name);
     });
 });
 /**
  * Simule une réponse d'API avec un fichier spécifique ayant pour extension .json, .js, .coffee, .html, .txt, .csv, .png, .jpg, .jpeg, .gif, .tif, .tiff, .zip
  * */
 (0, cucumber_1.When)(`je simule une requête {} sur l'url {string} nommée {string} avec le fichier suivant {}`, async function (verb, url, name, fixture) {
-    await (0, core_engine_1.addCookieWhenValueIsList)(this, core_engine_1.COOKIE_NAME.MOCK_URL, { name: name, url: url });
-    const data = await runner_commons_1.fs.readFileSync(path_1.default.join(getConfigDir(), `playwright/fixtures/${fixture}`));
+    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL, new core_engine_1.MockCookie(name, url, verb));
+    const data = runner_commons_1.fs.readFileSync(path_1.default.join(getConfigDir(), `playwright/fixtures/${fixture}`), "utf8");
     await this.page.route(url, async (route) => {
         await route.fulfill({ body: data });
+        await afterMock(this, url, verb, name);
     });
 });
 /**
@@ -395,13 +397,20 @@ function getConfigDir() {
  * */
 (0, cucumber_1.Then)(`je dois consommer le bouchon nommé {string}`, async function (name) {
     const cookie = await (0, core_engine_1.getCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL);
-    const mockUrls = JSON.parse(cookie.value);
-    const mockUrl = mockUrls.find(mock => mock.name === name);
-    await (0, test_1.expect)(mockUrl).not.toBeUndefined();
-    const requestPromise = await this.page.waitForResponse(mockUrl?.url);
-    const request = await requestPromise;
-    await (0, core_engine_1.deleteCookieByValue)(this, core_engine_1.COOKIE_NAME.MOCK_URL, mockUrl);
-    // console.debug("request: ", request);
+    (0, test_1.expect)(() => {
+        if (!cookie.isValid()) {
+            throw new Error(`Mock ${name} must be defined before use this sentence`);
+        }
+    }).not.toThrow();
+    await test_1.expect.poll(async () => {
+        const cookie = await (0, core_engine_1.getCookie)(this, core_engine_1.COOKIE_NAME.MOCK_URL);
+        const mockUrls = JSON.parse(cookie.value);
+        const mockUrl = mockUrls.find(mock => mock.name === name);
+        if (mockUrl) {
+            return mockUrl?.isConsumed;
+        }
+        return false;
+    }).toBeDefined();
 });
 /**
  * Attends un nombre de millisecondes. <b>Attention:</b> Utiliser cette phrase <b>en production</b> peut rendre votre <b>test <i>flaky</i></b>.
@@ -466,16 +475,32 @@ async function pressKey(world, key) {
             break;
     }
     await (0, core_engine_1.deleteCookieByName)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    await (0, core_engine_1.addCookieWhenValueIsList)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, { name: core_engine_1.FILTER_TYPE.SELECTOR_PARENT, value: "*:focus" });
+    await (0, core_engine_1.addCookie)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT, new core_engine_1.SelectedElementCookie(core_engine_1.FILTER_TYPE.SELECTOR_PARENT, "*:focus"));
 }
 async function click(world, role, name) {
     await (0, core_engine_1.getPageOrElement)(world).then(async (element) => {
         const byRole = element.getByRole(role, { name: name, includeHidden: true, exact: true });
         await (0, test_1.expect)(byRole).toHaveCount(1);
         await byRole.click({ timeout: runner_commons_1.DEFAULT_TIMEOUT });
-        await world.context.clearCookies();
+        await world.page.waitForLoadState();
+        await (0, core_engine_1.deleteCookieByName)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     });
 }
 function keyBoardFocusTarget(world) {
     return world.page.locator(":focus");
 }
+async function setMockAsConsumed(name, mock, world) {
+    const newMockCookie = new core_engine_1.MockCookie(name, mock.url, mock.verb);
+    newMockCookie.isConsumed = true;
+    await (0, core_engine_1.addCookie)(world, core_engine_1.COOKIE_NAME.MOCK_URL, newMockCookie);
+}
+async function afterMock(world, url, verb, name) {
+    await world.page.waitForResponse(url);
+    const cookie = await (0, core_engine_1.getCookie)(world, core_engine_1.COOKIE_NAME.MOCK_URL);
+    const mockCookie = JSON.parse(cookie.value);
+    for (const mock of mockCookie) {
+        if (mock.name === name && mock.verb === verb && mock.url === url) {
+            await setMockAsConsumed(name, mock, world);
+        }
+    }
+}

package/dist/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_alert.js

@@ -48,7 +48,7 @@ const test_1 = require("@playwright/test");
         const byRole = await element.getByRole("alert", { name: name, includeHidden: true, exact: true });
         await (0, test_1.expect)(byRole).toHaveCount(1);
         await byRole.type(textToType);
-        await this.context.clearCookies();
+        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     });
 });
 // End of Type Section

package/dist/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_alertdialog.js

@@ -48,7 +48,7 @@ const test_1 = require("@playwright/test");
         const byRole = await element.getByRole("alertdialog", { name: name, includeHidden: true, exact: true });
         await (0, test_1.expect)(byRole).toHaveCount(1);
         await byRole.type(textToType);
-        await this.context.clearCookies();
+        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     });
 });
 // End of Type Section

package/dist/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_application.js

@@ -48,7 +48,7 @@ const test_1 = require("@playwright/test");
         const byRole = await element.getByRole("application", { name: name, includeHidden: true, exact: true });
         await (0, test_1.expect)(byRole).toHaveCount(1);
         await byRole.type(textToType);
-        await this.context.clearCookies();
+        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     });
 });
 // End of Type Section

package/dist/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_article.js

@@ -48,7 +48,7 @@ const test_1 = require("@playwright/test");
         const byRole = await element.getByRole("article", { name: name, includeHidden: true, exact: true });
         await (0, test_1.expect)(byRole).toHaveCount(1);
         await byRole.type(textToType);
-        await this.context.clearCookies();
+        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     });
 });
 // End of Type Section

package/dist/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_banner.js

@@ -48,7 +48,7 @@ const test_1 = require("@playwright/test");
         const byRole = await element.getByRole("banner", { name: name, includeHidden: true, exact: true });
         await (0, test_1.expect)(byRole).toHaveCount(1);
         await byRole.type(textToType);
-        await this.context.clearCookies();
+        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     });
 });
 // End of Type Section

package/dist/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_button.js

@@ -48,7 +48,7 @@ const test_1 = require("@playwright/test");
         const byRole = await element.getByRole("button", { name: name, includeHidden: true, exact: true });
         await (0, test_1.expect)(byRole).toHaveCount(1);
         await byRole.type(textToType);
-        await this.context.clearCookies();
+        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     });
 });
 // End of Type Section

package/dist/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_cell.js

@@ -48,7 +48,7 @@ const test_1 = require("@playwright/test");
         const byRole = await element.getByRole("cell", { name: name, includeHidden: true, exact: true });
         await (0, test_1.expect)(byRole).toHaveCount(1);
         await byRole.type(textToType);
-        await this.context.clearCookies();
+        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     });
 });
 // End of Type Section