@uuv/playwright 3.61.0 → 3.63.0

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

@@ -53,13 +53,7 @@ const path_1 = __importDefault(require("path"));
  * Triggers a click on the selected element.<br/>Make sure you've selected an element beforehand with the <strong>within...</strong> phrases.
  * */
 (0, world_1.When)(`I click`, async function () {
-    const keyBoardFocusTargetObj = keyBoardFocusTarget(this);
-    if ((await keyBoardFocusTargetObj.count()) === 1) {
-        await keyBoardFocusTargetObj.click({ timeout: runner_commons_1.DEFAULT_TIMEOUT });
-    }
-    else {
-        await (0, core_engine_1.getPageOrElement)(this).then((element) => element.click({ timeout: runner_commons_1.DEFAULT_TIMEOUT }));
-    }
+    await (0, core_engine_1.clickFocusedElement)(this);
 });
 /**
  * Triggers a click on the element with given role and specific name
@@ -86,7 +80,7 @@ const path_1 = __importDefault(require("path"));
 (0, world_1.When)(`I reset context`, async function () {
     await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.TIMEOUT);
-    const keyBoardFocusTargetObj = keyBoardFocusTarget(this);
+    const keyBoardFocusTargetObj = (0, core_engine_1.keyBoardFocusTarget)(this);
     if ((await keyBoardFocusTargetObj.count()) === 1) {
         await keyBoardFocusTargetObj.blur();
     }
@@ -95,24 +89,20 @@ const path_1 = __importDefault(require("path"));
  * 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, world_1.When)(`within the element with selector {string}`, async function (selector) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const locator = element.locator(selector);
-        await (0, test_1.expect)(locator).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await locator.focus({ timeout: 10000 });
-    });
+    await (0, core_engine_1.findWithSelector)(this, 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.
  * */
 (0, world_1.When)(`I type the sentence {string}`, async function (textToType) {
-    await type(this, textToType);
+    await (0, core_engine_1.typeFocusedElement)(this, textToType);
 });
 /**
  * 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.
  * */
 (0, world_1.When)(`I enter the value {string}`, async function (textToType) {
-    await type(this, textToType);
+    await (0, core_engine_1.typeFocusedElement)(this, textToType);
 });
 /**
  * Writes the sentence passed as a parameter in the ag-Grid cell at the specified row and column name (useful for example to fill in a form field in ag-Grid).<br/>Make sure you've selected an ag-Grid element beforehand with the <strong>within...</strong> phrases.
@@ -120,8 +110,8 @@ const path_1 = __importDefault(require("path"));
 (0, world_1.When)(`I type the sentence {string} in aggrid cell at the row {int} and column named {string}`, async function (textToType, lineNumber, columnName) {
     await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
         // Confirm the element is a grid or treegrid
-        const elementRole = await element.getAttribute("role");
-        (0, test_1.expect)(["grid", "treegrid"], { message: "Focus element doesn't have grid/treegrid role" }).toContain(elementRole);
+        const elementRole = await (element.getAttribute("role"));
+        await (0, test_1.expect)(["grid", "treegrid"], { message: "Focus element doesn't have grid/treegrid role" }).toContain(elementRole);
         // Retrieve column index
         const columnElement = await element.getByRole("columnheader", { name: columnName, exact: true });
         const colIndex = Number(await columnElement.getAttribute("aria-colindex")) - 1;
@@ -137,15 +127,15 @@ const path_1 = __importDefault(require("path"));
  * Select the combo box option passed as a parameter (useful for example to fill in a combobox form field).<br/>Make sure you've selected a combo box element beforehand with the <strong>within a combo box named 'yourComboboxNamee'</strong> phrases.
  * */
 (0, world_1.When)(`I select the value {string}`, async function (valueToSet) {
-    const keyBoardFocusTargetObj = keyBoardFocusTarget(this);
+    const keyBoardFocusTargetObj = (0, core_engine_1.keyBoardFocusTarget)(this);
     if ((await keyBoardFocusTargetObj.count()) === 1) {
         await keyBoardFocusTargetObj.selectOption({ label: valueToSet });
     }
     else {
         await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
             // console.debug(element);
-            await element.focus({ timeout: 10000 });
-            await element.selectOption({ label: valueToSet });
+            await (element.focus({ timeout: 10000 }));
+            await (element.selectOption({ label: valueToSet }));
         });
     }
 });
@@ -202,7 +192,7 @@ const path_1 = __importDefault(require("path"));
  * Sets the timeout value (in millisecond) for finding element in the DOM <br />⚠ remember to deselect the element with <b>[I reset context](#i-reset-context)</b> if you're no longer acting on it
  * */
 (0, world_1.When)(`I set timeout with value {int}`, async function (newTimeout) {
-    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.TIMEOUT, new core_engine_1.TimeoutCookie("timeout", newTimeout));
+    await (0, core_engine_1.setTimeout)(this, newTimeout);
 });
 /**
  * Selects the element whose [accessible role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types) and accessible [name](https://russmaxdesign.github.io/html-elements-names/) are specified <br />⚠ remember to deselect the element with <b>[I reset context](#i-reset-context)</b> if you're no longer acting on it
@@ -215,11 +205,7 @@ const path_1 = __importDefault(require("path"));
  * */
 (0, world_1.When)(`within the element with testId {string}`, async function (testId) {
     testId = encodeURIComponent(testId);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const locator = element.getByTestId(testId);
-        await (0, test_1.expect)(locator).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await locator.focus({ timeout: 10000 });
-    });
+    await (0, core_engine_1.findWithTestId)(this, 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));
 });
 /**
@@ -257,7 +243,7 @@ const path_1 = __importDefault(require("path"));
  * Checks that an Html element exists with the specified selector
  * */
 (0, world_1.Then)(`I should see an element with selector {string}`, async function (selector) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.locator(selector)).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, core_engine_1.findWithSelector)(this, selector);
 });
 /**
  * Sets one or more headers to the indicated http request and only for the Http method (GET / POST / etc...) passed as a argument.<i> If you use Playwright as execution engine, <b>method</b> isn't used.</i>
@@ -294,27 +280,27 @@ const path_1 = __importDefault(require("path"));
  * */
 (0, world_1.Then)(`I should see an element with content {string}`, async function (textContent) {
     // TODO partie pris de faire en exactitude. A voir si on doit faire 2 phrases https://playwright.dev/docs/api/class-locator#locator-get-by-text
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByText(textContent, { exact: true })).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, test_1.expect)(await (0, core_engine_1.getWithContent)(this, textContent)).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Checks that an Html element does not exists with the specified content
  * */
 (0, world_1.Then)(`I should not see an element with content {string}`, async function (textContent) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByText(textContent, { exact: true })).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, test_1.expect)(await (0, core_engine_1.getWithContent)(this, textContent)).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Checks that an Html element exists with the specified data-testid attribute
  * */
 (0, world_1.Then)(`I should see an element with testId {string}`, async function (testId) {
     testId = encodeURIComponent(testId);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByTestId(testId, { exact: true })).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, core_engine_1.findWithTestId)(this, testId);
 });
 /**
  * Checks that an Html element does not exists with the specified data-testid attribute
  * */
 (0, world_1.Then)(`I should not see an element with testId {string}`, async function (testId) {
     testId = encodeURIComponent(testId);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByTestId(testId, { exact: true })).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, test_1.expect)(await (0, core_engine_1.getWithTestId)(this, testId)).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Check that the current page have no accessibility issue for [axe-core](https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md)
@@ -404,12 +390,7 @@ function getConfigDir() {
  * Checks that the Html element with the specified selector is focused<br/><a target='_blank' href='https://github.com/e2e-test-quest/uuv/blob/main/example/en-keyboard.feature'>Examples</a>
  * */
 (0, world_1.Then)(`the element with selector {string} should be keyboard focused`, async function (selector) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const locator = element.locator(selector);
-        await locator.focus({ timeout: 10000 });
-        await (0, test_1.expect)(locator).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, test_1.expect)(locator).toBeFocused();
-    });
+    await (0, test_1.expect)((await (0, core_engine_1.findWithSelector)(this, selector))).toBeFocused({ timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Checks that an Html element exists with the specified [accessible role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types), [name](https://russmaxdesign.github.io/html-elements-names/) and content, and with the disabled attribute set to true
@@ -428,25 +409,22 @@ function getConfigDir() {
  * */
 (0, world_1.Then)(`I should see an element with aria-label {string}`, async function (expectedAriaLabel) {
     expectedAriaLabel = encodeURIComponent(expectedAriaLabel);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByLabel(expectedAriaLabel, { exact: true })).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, core_engine_1.findWithAriaLabel)(this, expectedAriaLabel);
 });
 /**
  * Checks that an Html element does not exists with the specified aria-label attribute
  * */
 (0, world_1.Then)(`I should not see an element with aria-label {string}`, async function (expectedAriaLabel) {
     expectedAriaLabel = encodeURIComponent(expectedAriaLabel);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByLabel(expectedAriaLabel, { exact: true })).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, test_1.expect)((await (0, core_engine_1.getWithAriaLabel)(this, expectedAriaLabel))).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Checks that an Html element exists with the specified aria-label attribute and content
  * */
 (0, world_1.Then)(`I should see an element with aria-label {string} and content {string}`, async function (expectedAriaLabel, expectedTextContent) {
     expectedAriaLabel = encodeURIComponent(expectedAriaLabel);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byLabel = element.getByLabel(expectedAriaLabel, { exact: true });
-        await (0, test_1.expect)(byLabel).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, test_1.expect)(byLabel.filter({ hasText: expectedTextContent })).toHaveCount(1);
-    });
+    const byLabel = await (0, core_engine_1.findWithAriaLabel)(this, expectedAriaLabel);
+    await (0, test_1.expect)(byLabel.filter({ hasText: expectedTextContent })).toHaveCount(1);
 });
 /**
  * Move to the previous html element that can be reached with Tab and checks that the Html element with the specified [accessible role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types) and [name](https://russmaxdesign.github.io/html-elements-names/) is focused<br/><a target='_blank' href='https://github.com/e2e-test-quest/uuv/blob/main/example/en-keyboard.feature'>Examples</a>
@@ -609,9 +587,6 @@ async function pressKey(world, key) {
     await (0, core_engine_1.deleteCookieByName)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     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"));
 }
-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;
@@ -627,16 +602,3 @@ async function afterMock(world, url, verb, name) {
         }
     }
 }
-async function type(world, textToType) {
-    const keyBoardFocusTargetObj = keyBoardFocusTarget(world);
-    if ((await keyBoardFocusTargetObj.count()) === 1) {
-        await keyBoardFocusTargetObj.type(textToType);
-    }
-    else {
-        await (0, core_engine_1.getPageOrElement)(world).then(async (element) => {
-            // console.debug(element);
-            await element.focus({ timeout: 10000 });
-            await element.type(textToType);
-        });
-    }
-}

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

@@ -53,13 +53,7 @@ const path_1 = __importDefault(require("path"));
  * Déclenche un click sur l'élément sélectionné.<br/>Assurez vous d'avoir effectué une sélection d'élément avant avec les phrases <strong>Je vais à l'intérieur...</strong>.
  * */
 (0, world_1.When)(`je clique`, async function () {
-    const keyBoardFocusTargetObj = keyBoardFocusTarget(this);
-    if ((await keyBoardFocusTargetObj.count()) === 1) {
-        await keyBoardFocusTargetObj.click({ timeout: runner_commons_1.DEFAULT_TIMEOUT });
-    }
-    else {
-        await (0, core_engine_1.getPageOrElement)(this).then((element) => element.click({ timeout: runner_commons_1.DEFAULT_TIMEOUT }));
-    }
+    await (0, core_engine_1.clickFocusedElement)(this);
 });
 /**
  * Déclenche un click sur un élément avec le rôle et le nom donnés
@@ -86,7 +80,7 @@ const path_1 = __importDefault(require("path"));
 (0, world_1.When)(`je reinitialise le contexte`, async function () {
     await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.TIMEOUT);
-    const keyBoardFocusTargetObj = keyBoardFocusTarget(this);
+    const keyBoardFocusTargetObj = (0, core_engine_1.keyBoardFocusTarget)(this);
     if ((await keyBoardFocusTargetObj.count()) === 1) {
         await keyBoardFocusTargetObj.blur();
     }
@@ -95,24 +89,20 @@ const path_1 = __importDefault(require("path"));
  * 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, world_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(async (element) => {
-        const locator = element.locator(selector);
-        await (0, test_1.expect)(locator).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await locator.focus({ timeout: 10000 });
-    });
+    await (0, core_engine_1.findWithSelector)(this, 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));
 });
 /**
  * Saisie 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>.
  * */
 (0, world_1.When)(`je saisie le(s) mot(s) {string}`, async function (textToType) {
-    await type(this, textToType);
+    await (0, core_engine_1.typeFocusedElement)(this, textToType);
 });
 /**
  * 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>.
  * */
 (0, world_1.When)(`j'entre la valeur {string}`, async function (textToType) {
-    await type(this, textToType);
+    await (0, core_engine_1.typeFocusedElement)(this, textToType);
 });
 /**
  * Saisie de la phrase passée en paramètre dans une cellule d'une grille ag-Grid (utile par exemple pour remplir une cellule dans une grille).<br/>Assurez vous d'avoir effectué une sélection d'élément avant avec les phrases <strong>je vais à l'intérieur...</strong>.
@@ -120,8 +110,8 @@ const path_1 = __importDefault(require("path"));
 (0, world_1.When)(`je saisie le(s) mot(s) {string} dans la cellule aggrid à la ligne {int} et la colonne nommée {string}`, async function (textToType, lineNumber, columnName) {
     await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
         // Confirm the element is a grid or treegrid
-        const elementRole = await element.getAttribute("role");
-        (0, test_1.expect)(["grid", "treegrid"], { message: "Focus element doesn't have grid/treegrid role" }).toContain(elementRole);
+        const elementRole = await (element.getAttribute("role"));
+        await (0, test_1.expect)(["grid", "treegrid"], { message: "Focus element doesn't have grid/treegrid role" }).toContain(elementRole);
         // Retrieve column index
         const columnElement = await element.getByRole("columnheader", { name: columnName, exact: true });
         const colIndex = Number(await columnElement.getAttribute("aria-colindex")) - 1;
@@ -137,15 +127,15 @@ const path_1 = __importDefault(require("path"));
  * Sélectionne l'option passée en paramètre (utile par exemple pour remplir un champ le liste déroulante).<br/>Assurez vous d'avoir effectué une sélection d'élément avant avec les phrases <strong>je vais à l'intérieur de la liste déroulante nommée 'maListeDeroulante'</strong>.
  * */
 (0, world_1.When)(`je sélectionne la valeur {string}`, async function (valueToSet) {
-    const keyBoardFocusTargetObj = keyBoardFocusTarget(this);
+    const keyBoardFocusTargetObj = (0, core_engine_1.keyBoardFocusTarget)(this);
     if ((await keyBoardFocusTargetObj.count()) === 1) {
         await keyBoardFocusTargetObj.selectOption({ label: valueToSet });
     }
     else {
         await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
             // console.debug(element);
-            await element.focus({ timeout: 10000 });
-            await element.selectOption({ label: valueToSet });
+            await (element.focus({ timeout: 10000 }));
+            await (element.selectOption({ label: valueToSet }));
         });
     }
 });
@@ -202,7 +192,7 @@ const path_1 = __importDefault(require("path"));
  * Positionne le timeout (en milliseconde) pour la recherche des éléments dans le dom <br />⚠ pensez à déselectionner l'élement avec <b>[je reinitialise le contexte](#je-reinitialise-le-contexte)</b> si vous n'agissez plus dessus
  * */
 (0, world_1.When)(`je positionne le timeout à {int} secondes`, async function (newTimeout) {
-    await (0, core_engine_1.addCookie)(this, core_engine_1.COOKIE_NAME.TIMEOUT, new core_engine_1.TimeoutCookie("timeout", newTimeout));
+    await (0, core_engine_1.setTimeout)(this, newTimeout);
 });
 /**
  * Sélectionne l'élément dont le [rôle accessible](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types) et le [nom accessible](https://russmaxdesign.github.io/html-elements-names/) sont spécifiés <br />⚠ pensez à déselectionner l'élement avec <b>[je reinitialise le contexte](#je-reinitialise-le-contexte)</b> si vous n'agissez plus dessus
@@ -215,11 +205,7 @@ const path_1 = __importDefault(require("path"));
  * */
 (0, world_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) => {
-        const locator = element.getByTestId(testId);
-        await (0, test_1.expect)(locator).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await locator.focus({ timeout: 10000 });
-    });
+    await (0, core_engine_1.findWithTestId)(this, 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));
 });
 /**
@@ -257,7 +243,7 @@ const path_1 = __importDefault(require("path"));
  * Vérifie qu'un élément Html existe avec le sélecteur spécifié
  * */
 (0, world_1.Then)(`je dois voir un élément ayant pour sélecteur {string}`, async function (selector) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.locator(selector)).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, core_engine_1.findWithSelector)(this, selector);
 });
 /**
  * Positionne un ou plusieurs headers à la requête http indiquée et uniquement pour la méthode Http (GET / POST / etc...) passée en paramètre. <i>Si le moteur d'exécution est playwright, la <b>méthode</b> n'est pas gérée.</i>
@@ -294,27 +280,27 @@ const path_1 = __importDefault(require("path"));
  * */
 (0, world_1.Then)(`je dois voir un élément qui contient {string}`, async function (textContent) {
     // TODO partie pris de faire en exactitude. A voir si on doit faire 2 phrases https://playwright.dev/docs/api/class-locator#locator-get-by-text
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByText(textContent, { exact: true })).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, test_1.expect)(await (0, core_engine_1.getWithContent)(this, textContent)).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Vérifie qu'un élément Html n'existe pas avec le contenu spécifié
  * */
 (0, world_1.Then)(`je ne dois pas voir un élément qui contient {string}`, async function (textContent) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByText(textContent, { exact: true })).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, test_1.expect)(await (0, core_engine_1.getWithContent)(this, textContent)).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Vérifie qu'un élément Html existe avec l'attribut data-testid spécifié
  * */
 (0, world_1.Then)(`je dois voir un élément ayant pour testId {string}`, async function (testId) {
     testId = encodeURIComponent(testId);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByTestId(testId, { exact: true })).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, core_engine_1.findWithTestId)(this, testId);
 });
 /**
  * Vérifie qu'un élément Html n'existe pas avec l'attribut data-testid spécifié
  * */
 (0, world_1.Then)(`je ne dois pas voir un élément ayant pour testId {string}`, async function (testId) {
     testId = encodeURIComponent(testId);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByTestId(testId, { exact: true })).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, test_1.expect)(await (0, core_engine_1.getWithTestId)(this, testId)).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Vérifie sur la page courante qu'il n'y a aucune erreur d'accessibilité [axe-core](https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md)
@@ -404,12 +390,7 @@ function getConfigDir() {
  * Vérifie que l'élément Html avec le sélecteur est focus<br/><a target='_blank' href='https://github.com/e2e-test-quest/uuv/blob/main/example/fr-keyboard.feature'>Exemples</a>
  * */
 (0, world_1.Then)(`l'élément avec le sélecteur {string} doit avoir le focus clavier`, async function (selector) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const locator = element.locator(selector);
-        await locator.focus({ timeout: 10000 });
-        await (0, test_1.expect)(locator).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, test_1.expect)(locator).toBeFocused();
-    });
+    await (0, test_1.expect)((await (0, core_engine_1.findWithSelector)(this, selector))).toBeFocused({ timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Vérifie qu'un élément Html existe avec le [rôle accessible](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types), le [nom accessible](https://russmaxdesign.github.io/html-elements-names/) et le contenu spécifiés, et avec l'attribut disabled à true
@@ -428,25 +409,22 @@ function getConfigDir() {
  * */
 (0, world_1.Then)(`je dois voir un élément ayant pour aria-label {string}`, async function (expectedAriaLabel) {
     expectedAriaLabel = encodeURIComponent(expectedAriaLabel);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByLabel(expectedAriaLabel, { exact: true })).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, core_engine_1.findWithAriaLabel)(this, expectedAriaLabel);
 });
 /**
  * Vérifie qu'un élément Html n'existe pas avec l'attribut aria-label spécifié
  * */
 (0, world_1.Then)(`je ne dois pas voir un élément ayant pour aria-label {string}`, async function (expectedAriaLabel) {
     expectedAriaLabel = encodeURIComponent(expectedAriaLabel);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => (0, test_1.expect)(element.getByLabel(expectedAriaLabel, { exact: true })).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) }));
+    await (0, test_1.expect)((await (0, core_engine_1.getWithAriaLabel)(this, expectedAriaLabel))).toHaveCount(0, { timeout: await (0, core_engine_1.getTimeout)(this) });
 });
 /**
  * Vérifie qu'un élément Html existe avec l'attribut aria-label et le contenu spécifiés
  * */
 (0, world_1.Then)(`je dois voir un élément ayant pour aria-label {string} et pour contenu {string}`, async function (expectedAriaLabel, expectedTextContent) {
     expectedAriaLabel = encodeURIComponent(expectedAriaLabel);
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byLabel = element.getByLabel(expectedAriaLabel, { exact: true });
-        await (0, test_1.expect)(byLabel).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, test_1.expect)(byLabel.filter({ hasText: expectedTextContent })).toHaveCount(1);
-    });
+    const byLabel = await (0, core_engine_1.findWithAriaLabel)(this, expectedAriaLabel);
+    await (0, test_1.expect)(byLabel.filter({ hasText: expectedTextContent })).toHaveCount(1);
 });
 /**
  * Se déplace au précédent élément HTML atteignable avec la tabulation et vérifie que l'élément Html avec le [rôle accessible](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types) et le [nom accessible](https://russmaxdesign.github.io/html-elements-names/) a le focus clavier<br/><a target='_blank' href='https://github.com/e2e-test-quest/uuv/blob/main/example/fr-keyboard.feature'>Exemples</a>
@@ -609,9 +587,6 @@ async function pressKey(world, key) {
     await (0, core_engine_1.deleteCookieByName)(world, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
     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"));
 }
-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;
@@ -627,16 +602,3 @@ async function afterMock(world, url, verb, name) {
         }
     }
 }
-async function type(world, textToType) {
-    const keyBoardFocusTargetObj = keyBoardFocusTarget(world);
-    if ((await keyBoardFocusTargetObj.count()) === 1) {
-        await keyBoardFocusTargetObj.type(textToType);
-    }
-    else {
-        await (0, core_engine_1.getPageOrElement)(world).then(async (element) => {
-            // console.debug(element);
-            await element.focus({ timeout: 10000 });
-            await element.type(textToType);
-        });
-    }
-}

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

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const core_engine_1 = require("../../../core-engine");
 const world_1 = require("../../../../../preprocessor/run/world");
-const test_1 = require("@playwright/test");
 // Begin of General Section
 /**
  * Selects the element whose [accessible role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types) and accessible [name](https://russmaxdesign.github.io/html-elements-names/) are specified <br />⚠ remember to deselect the element with <b>[I reset context](#i-reset-context)</b> if you're no longer acting on it
@@ -43,34 +42,20 @@ const test_1 = require("@playwright/test");
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 (0, world_1.When)(`I type the sentence {string} in the alert named {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("alert", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await byRole.type(textToType);
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.type)(this, "alert", name, textToType);
 });
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 (0, world_1.When)(`I enter the value {string} in the alert named {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("alert", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.type)(this, "alert", name, textToType);
 });
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 (0, world_1.When)(`I should see an alert named {string} with value {string}`, async function (name, expectedValue) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("alert", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, test_1.expect)(byRole).toHaveValue(expectedValue, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.findWithRoleAndNameAndValue)(this, "alert", name, expectedValue);
+    await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
 });
 // End of Type Section
 // Begin of Content Section

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

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const core_engine_1 = require("../../../core-engine");
 const world_1 = require("../../../../../preprocessor/run/world");
-const test_1 = require("@playwright/test");
 // Begin of General Section
 /**
  * Selects the element whose [accessible role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types) and accessible [name](https://russmaxdesign.github.io/html-elements-names/) are specified <br />⚠ remember to deselect the element with <b>[I reset context](#i-reset-context)</b> if you're no longer acting on it
@@ -43,34 +42,20 @@ const test_1 = require("@playwright/test");
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 (0, world_1.When)(`I type the sentence {string} in the alert dialog named {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("alertdialog", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await byRole.type(textToType);
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.type)(this, "alertdialog", name, textToType);
 });
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 (0, world_1.When)(`I enter the value {string} in the alert dialog named {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("alertdialog", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.type)(this, "alertdialog", name, textToType);
 });
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 (0, world_1.When)(`I should see an alert dialog named {string} with value {string}`, async function (name, expectedValue) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("alertdialog", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, test_1.expect)(byRole).toHaveValue(expectedValue, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.findWithRoleAndNameAndValue)(this, "alertdialog", name, expectedValue);
+    await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
 });
 // End of Type Section
 // Begin of Content Section

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

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const core_engine_1 = require("../../../core-engine");
 const world_1 = require("../../../../../preprocessor/run/world");
-const test_1 = require("@playwright/test");
 // Begin of General Section
 /**
  * Selects the element whose [accessible role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types) and accessible [name](https://russmaxdesign.github.io/html-elements-names/) are specified <br />⚠ remember to deselect the element with <b>[I reset context](#i-reset-context)</b> if you're no longer acting on it
@@ -43,34 +42,20 @@ const test_1 = require("@playwright/test");
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 (0, world_1.When)(`I type the sentence {string} in the application named {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("application", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await byRole.type(textToType);
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.type)(this, "application", name, textToType);
 });
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 (0, world_1.When)(`I enter the value {string} in the application named {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("application", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.type)(this, "application", name, textToType);
 });
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 (0, world_1.When)(`I should see an application named {string} with value {string}`, async function (name, expectedValue) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("application", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, test_1.expect)(byRole).toHaveValue(expectedValue, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.findWithRoleAndNameAndValue)(this, "application", name, expectedValue);
+    await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
 });
 // End of Type Section
 // Begin of Content Section

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

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const core_engine_1 = require("../../../core-engine");
 const world_1 = require("../../../../../preprocessor/run/world");
-const test_1 = require("@playwright/test");
 // Begin of General Section
 /**
  * Selects the element whose [accessible role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles#aria_role_types) and accessible [name](https://russmaxdesign.github.io/html-elements-names/) are specified <br />⚠ remember to deselect the element with <b>[I reset context](#i-reset-context)</b> if you're no longer acting on it
@@ -43,34 +42,20 @@ const test_1 = require("@playwright/test");
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 (0, world_1.When)(`I type the sentence {string} in the article named {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("article", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await byRole.type(textToType);
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.type)(this, "article", name, textToType);
 });
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 (0, world_1.When)(`I enter the value {string} in the article named {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("article", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.type)(this, "article", name, textToType);
 });
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 (0, world_1.When)(`I should see an article named {string} with value {string}`, async function (name, expectedValue) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("article", { name: name, exact: true });
-        await (0, test_1.expect)(byRole).toHaveCount(1, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, test_1.expect)(byRole).toHaveValue(expectedValue, { timeout: await (0, core_engine_1.getTimeout)(this) });
-        await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await (0, core_engine_1.findWithRoleAndNameAndValue)(this, "article", name, expectedValue);
+    await (0, core_engine_1.deleteCookieByName)(this, core_engine_1.COOKIE_NAME.SELECTED_ELEMENT);
 });
 // End of Type Section
 // Begin of Content Section