@uuv/playwright 3.61.0 → 3.63.0

package/dist/cucumber/step_definitions/playwright/generated/enriched/fr/_fr-generated-steps-definition_treegrid.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
 /**
  * Sélectionne l'élément ayant le rôle treegrid 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
@@ -43,34 +42,20 @@ const test_1 = require("@playwright/test");
  * Saisie de la phrase passée en paramètre dans le champ spécifié (utile par exemple pour remplir un champ de formulaire).
  * */
 (0, world_1.When)(`je saisie le(s) mot(s) {string} dans la grille d'arbre nommée {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("treegrid", { 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, "treegrid", name, textToType);
 });
 /**
  * Saisie de la phrase passée en paramètre dans le champ spécifié (utile par exemple pour remplir un champ de formulaire).
  * */
 (0, world_1.When)(`j'entre la valeur {string} dans la grille d'arbre nommée {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("treegrid", { 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, "treegrid", name, textToType);
 });
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 (0, world_1.When)(`je dois voir une grille d'arbre nommée {string} avec la valeur {string}`, async function (name, expectedValue) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("treegrid", { 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, "treegrid", 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/fr/_fr-generated-steps-definition_treeitem.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
 /**
  * Sélectionne l'élément ayant le rôle treeitem 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
@@ -43,34 +42,20 @@ const test_1 = require("@playwright/test");
  * Saisie de la phrase passée en paramètre dans le champ spécifié (utile par exemple pour remplir un champ de formulaire).
  * */
 (0, world_1.When)(`je saisie le(s) mot(s) {string} dans l'élément d'arbre nommé {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("treeitem", { 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, "treeitem", name, textToType);
 });
 /**
  * Saisie de la phrase passée en paramètre dans le champ spécifié (utile par exemple pour remplir un champ de formulaire).
  * */
 (0, world_1.When)(`j'entre la valeur {string} dans l'élément d'arbre nommé {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("treeitem", { 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, "treeitem", name, textToType);
 });
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 (0, world_1.When)(`je dois voir un élément d'arbre nommé {string} avec la valeur {string}`, async function (name, expectedValue) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("treeitem", { 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, "treeitem", 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/fr/_fr-generated-steps-definition_widget.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
 /**
  * Sélectionne l'élément ayant le rôle widget 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
@@ -43,34 +42,20 @@ const test_1 = require("@playwright/test");
  * Saisie de la phrase passée en paramètre dans le champ spécifié (utile par exemple pour remplir un champ de formulaire).
  * */
 (0, world_1.When)(`je saisie le(s) mot(s) {string} dans le widget nommé {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("widget", { 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, "widget", name, textToType);
 });
 /**
  * Saisie de la phrase passée en paramètre dans le champ spécifié (utile par exemple pour remplir un champ de formulaire).
  * */
 (0, world_1.When)(`j'entre la valeur {string} dans le widget nommé {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("widget", { 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, "widget", name, textToType);
 });
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 (0, world_1.When)(`je dois voir un widget nommé {string} avec la valeur {string}`, async function (name, expectedValue) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("widget", { 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, "widget", 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/fr/_fr-generated-steps-definition_window.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
 /**
  * Sélectionne l'élément ayant le rôle window 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
@@ -43,34 +42,20 @@ const test_1 = require("@playwright/test");
  * Saisie de la phrase passée en paramètre dans le champ spécifié (utile par exemple pour remplir un champ de formulaire).
  * */
 (0, world_1.When)(`je saisie le(s) mot(s) {string} dans la fenêtre nommée {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("window", { 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, "window", name, textToType);
 });
 /**
  * Saisie de la phrase passée en paramètre dans le champ spécifié (utile par exemple pour remplir un champ de formulaire).
  * */
 (0, world_1.When)(`j'entre la valeur {string} dans la fenêtre nommée {string}`, async function (textToType, name) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("window", { 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, "window", name, textToType);
 });
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 (0, world_1.When)(`je dois voir une fenêtre nommée {string} avec la valeur {string}`, async function (name, expectedValue) {
-    await (0, core_engine_1.getPageOrElement)(this).then(async (element) => {
-        const byRole = await element.getByRole("window", { 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, "window", 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/index.d.ts

@@ -0,0 +1 @@
+export { getPageOrElement, addCookie, getCookie, deleteCookieByName, withinSelector, withinRoleAndName, getWithContent, getWithTestId, getWithAriaLabel, findWithRoleAndName, notFoundWithRoleAndName, findWithRoleAndNameAndContent, findWithRoleAndNameFocused, findWithRoleAndNameAndChecked, findWithRoleAndNameAndUnchecked, findWithRoleAndNameAndContentDisabled, findWithRoleAndNameDisabled, findWithRoleAndNameAndContentEnabled, findWithRoleAndNameEnabled, findWithRoleAndNameAndValue, findWithSelector, findWithTestId, findWithAriaLabel, click, clickFocusedElement, type, typeFocusedElement, getTimeout, setTimeout, } from "./core-engine";

package/dist/cucumber/step_definitions/playwright/index.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTimeout = exports.typeFocusedElement = exports.type = exports.clickFocusedElement = exports.click = exports.findWithAriaLabel = exports.findWithTestId = exports.findWithSelector = exports.findWithRoleAndNameAndValue = exports.findWithRoleAndNameEnabled = exports.findWithRoleAndNameAndContentEnabled = exports.findWithRoleAndNameDisabled = exports.findWithRoleAndNameAndContentDisabled = exports.findWithRoleAndNameAndUnchecked = exports.findWithRoleAndNameAndChecked = exports.findWithRoleAndNameFocused = exports.findWithRoleAndNameAndContent = exports.notFoundWithRoleAndName = exports.findWithRoleAndName = exports.getWithAriaLabel = exports.getWithTestId = exports.getWithContent = exports.withinRoleAndName = exports.withinSelector = exports.deleteCookieByName = exports.getCookie = exports.addCookie = exports.getPageOrElement = void 0;
+var core_engine_1 = require("./core-engine");
+Object.defineProperty(exports, "getPageOrElement", { enumerable: true, get: function () { return core_engine_1.getPageOrElement; } });
+Object.defineProperty(exports, "addCookie", { enumerable: true, get: function () { return core_engine_1.addCookie; } });
+Object.defineProperty(exports, "getCookie", { enumerable: true, get: function () { return core_engine_1.getCookie; } });
+Object.defineProperty(exports, "deleteCookieByName", { enumerable: true, get: function () { return core_engine_1.deleteCookieByName; } });
+Object.defineProperty(exports, "withinSelector", { enumerable: true, get: function () { return core_engine_1.withinSelector; } });
+Object.defineProperty(exports, "withinRoleAndName", { enumerable: true, get: function () { return core_engine_1.withinRoleAndName; } });
+Object.defineProperty(exports, "getWithContent", { enumerable: true, get: function () { return core_engine_1.getWithContent; } });
+Object.defineProperty(exports, "getWithTestId", { enumerable: true, get: function () { return core_engine_1.getWithTestId; } });
+Object.defineProperty(exports, "getWithAriaLabel", { enumerable: true, get: function () { return core_engine_1.getWithAriaLabel; } });
+Object.defineProperty(exports, "findWithRoleAndName", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndName; } });
+Object.defineProperty(exports, "notFoundWithRoleAndName", { enumerable: true, get: function () { return core_engine_1.notFoundWithRoleAndName; } });
+Object.defineProperty(exports, "findWithRoleAndNameAndContent", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndNameAndContent; } });
+Object.defineProperty(exports, "findWithRoleAndNameFocused", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndNameFocused; } });
+Object.defineProperty(exports, "findWithRoleAndNameAndChecked", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndNameAndChecked; } });
+Object.defineProperty(exports, "findWithRoleAndNameAndUnchecked", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndNameAndUnchecked; } });
+Object.defineProperty(exports, "findWithRoleAndNameAndContentDisabled", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndNameAndContentDisabled; } });
+Object.defineProperty(exports, "findWithRoleAndNameDisabled", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndNameDisabled; } });
+Object.defineProperty(exports, "findWithRoleAndNameAndContentEnabled", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndNameAndContentEnabled; } });
+Object.defineProperty(exports, "findWithRoleAndNameEnabled", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndNameEnabled; } });
+Object.defineProperty(exports, "findWithRoleAndNameAndValue", { enumerable: true, get: function () { return core_engine_1.findWithRoleAndNameAndValue; } });
+Object.defineProperty(exports, "findWithSelector", { enumerable: true, get: function () { return core_engine_1.findWithSelector; } });
+Object.defineProperty(exports, "findWithTestId", { enumerable: true, get: function () { return core_engine_1.findWithTestId; } });
+Object.defineProperty(exports, "findWithAriaLabel", { enumerable: true, get: function () { return core_engine_1.findWithAriaLabel; } });
+Object.defineProperty(exports, "click", { enumerable: true, get: function () { return core_engine_1.click; } });
+Object.defineProperty(exports, "clickFocusedElement", { enumerable: true, get: function () { return core_engine_1.clickFocusedElement; } });
+Object.defineProperty(exports, "type", { enumerable: true, get: function () { return core_engine_1.type; } });
+Object.defineProperty(exports, "typeFocusedElement", { enumerable: true, get: function () { return core_engine_1.typeFocusedElement; } });
+Object.defineProperty(exports, "getTimeout", { enumerable: true, get: function () { return core_engine_1.getTimeout; } });
+Object.defineProperty(exports, "setTimeout", { enumerable: true, get: function () { return core_engine_1.setTimeout; } });

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./cucumber/preprocessor";
+export * from "./cucumber/step_definitions/playwright";
 export * from "./lib/config";

package/dist/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./cucumber/preprocessor"), exports);
+__exportStar(require("./cucumber/step_definitions/playwright"), exports);
 __exportStar(require("./lib/config"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uuv/playwright",
-  "version": "3.61.0",
+  "version": "3.63.0",
   "type": "commonjs",
   "author": "Louis Fredice NJAKO MOLOM (https://github.com/luifr10) & Stanley SERVICAL (https://github.com/stanlee974)",
   "description": "A solution to facilitate the writing and execution of E2E tests understandable by any human being using cucumber(BDD) and playwright",
@@ -46,8 +46,8 @@
     "@cucumber/cucumber": "12.6.0",
     "@cucumber/tag-expressions": "9.1.0",
     "@playwright/test": "^1.55.0",
-    "@uuv/a11y": "1.0.0-beta.95",
-    "@uuv/runner-commons": "2.74.0",
+    "@uuv/a11y": "1.0.0-beta.96",
+    "@uuv/runner-commons": "2.75.0",
     "axe-core": "4.11.1",
     "axe-playwright": "2.2.2",
     "chalk-table": "1.0.2",
@@ -101,7 +101,7 @@
     "eslint-plugin-playwright": "2.2.2",
     "ts-loader": "9.5.4",
     "tsconfig-paths": "4.2.0",
-    "webpack": "5.105.2"
+    "webpack": "5.105.3"
   },
   "funding": {
     "type": "opencollective",

package/src/cucumber/step_definitions/playwright/generated/_en-generated-cucumber-steps-definition.ts

@@ -15,7 +15,7 @@ NE PAS MODIFIER, FICHIER GENERE
  * understanding English or French.
  */
 
-import { DEFAULT_TIMEOUT, fs, KEY_PRESS } from "@uuv/runner-commons";
+import { fs, KEY_PRESS } from "@uuv/runner-commons";
 
 import { checkA11y, injectAxe } from "axe-playwright";
 import { devices, expect } from "@playwright/test";
@@ -23,6 +23,7 @@ import { Locator } from "playwright";
 import { DataTable } from "@cucumber/cucumber";
 import {
     addCookie,
+    typeFocusedElement,
     click,
     COOKIE_NAME,
     deleteCookieByName,
@@ -32,14 +33,22 @@ import {
     findWithRoleAndNameAndContentDisabled,
     findWithRoleAndNameAndContentEnabled,
     findWithRoleAndNameFocused,
+    getWithContent,
+    findWithSelector,
+    getWithTestId,
+    findWithTestId,
+    getWithAriaLabel,
+    findWithAriaLabel,
     getCookie,
     getPageOrElement,
     getTimeout,
     MockCookie,
     notFoundWithRoleAndName,
     SelectedElementCookie,
-    TimeoutCookie,
-    withinRoleAndName
+    setTimeout,
+    withinRoleAndName,
+    keyBoardFocusTarget,
+    clickFocusedElement
 } from "../core-engine";
 import { Given, Then, When, World } from "../../../preprocessor/run/world";
 import { ContextObject, RunOptions } from "axe-core";
@@ -84,12 +93,7 @@ Given(`I visit path {string}`, async function(siteUrl: string) {
  * Triggers a click on the selected element.<br/>Make sure you've selected an element beforehand with the <strong>within...</strong> phrases.
  * */
 When(`I click`, async function() {
-  const keyBoardFocusTargetObj = keyBoardFocusTarget(this);
-  if ((await keyBoardFocusTargetObj.count()) === 1) {
-    await keyBoardFocusTargetObj.click({ timeout: DEFAULT_TIMEOUT });
-  } else {
-    await getPageOrElement(this).then((element: Locator) => element.click({ timeout: DEFAULT_TIMEOUT }));
-  }
+  await clickFocusedElement(this);
 });
 
 /**
@@ -129,11 +133,7 @@ When(`I reset context`, async function() {
  * 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
  * */
 When(`within the element with selector {string}`, async function(selector: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const locator = element.locator(selector);
-    await expect(locator).toHaveCount(1, { timeout: await getTimeout(this) });
-    await locator.focus({ timeout: 10000 });
-  });
+  await findWithSelector(this, selector);
   await addCookie(this, COOKIE_NAME.SELECTED_ELEMENT, new SelectedElementCookie(FILTER_TYPE.SELECTOR, selector));
 });
 
@@ -141,24 +141,24 @@ When(`within the element with selector {string}`, async function(selector: strin
  * 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.
  * */
 When(`I type the sentence {string}`, async function(textToType: string) {
-    await type(this, textToType);
+    await 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.
  * */
 When(`I enter the value {string}`, async function(textToType: string) {
-    await type(this, textToType);
+    await 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.
  * */
 When(`I type the sentence {string} in aggrid cell at the row {int} and column named {string}`, async function(textToType: string, lineNumber: number, columnName: string) {
-    await getPageOrElement(this).then(async (element: Locator) => {
+    await getPageOrElement(this).then(async (element) => {
         // Confirm the element is a grid or treegrid
-        const elementRole = await element.getAttribute("role");
-        expect(["grid", "treegrid"], { message: "Focus element doesn't have grid/treegrid role" }).toContain(elementRole!);
+        const elementRole = await((element as Locator).getAttribute("role"));
+        await 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 });
@@ -182,10 +182,10 @@ When(`I select the value {string}`, async function(valueToSet: string) {
     if ((await keyBoardFocusTargetObj.count()) === 1) {
         await keyBoardFocusTargetObj.selectOption({ label: valueToSet });
     } else {
-        await getPageOrElement(this).then(async (element: Locator) => {
+        await getPageOrElement(this).then(async (element) => {
             // console.debug(element);
-            await element.focus({ timeout: 10000 });
-            await element.selectOption({ label: valueToSet });
+            await((element as Locator).focus({ timeout: 10000 }));
+            await((element as Locator).selectOption({ label: valueToSet }));
         });
     }
 });
@@ -249,7 +249,7 @@ When(`I go to next keyboard element`, async function() {
  * 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
  * */
 When(`I set timeout with value {int}`, async function(newTimeout: number) {
-  await addCookie(this, COOKIE_NAME.TIMEOUT, new TimeoutCookie("timeout", newTimeout));
+  await setTimeout(this, newTimeout);
 });
 
 /**
@@ -264,11 +264,7 @@ When(`within the element with role {string} and name {string}`, async function(r
  * */
 When(`within the element with testId {string}`, async function(testId: string) {
   testId = encodeURIComponent(testId);
-  await getPageOrElement(this).then(async (element) => {
-    const locator = element.getByTestId(testId);
-    await expect(locator).toHaveCount(1, { timeout: await getTimeout(this) });
-    await locator.focus({ timeout: 10000 });
-  });
+  await findWithTestId(this, testId);
   await addCookie(this, COOKIE_NAME.SELECTED_ELEMENT, new SelectedElementCookie(FILTER_TYPE.TEST_ID, testId));
 });
 
@@ -320,7 +316,7 @@ When(
  * Checks that an Html element exists with the specified selector
  * */
 Then(`I should see an element with selector {string}`, async function(selector: string) {
-  await getPageOrElement(this).then(async (element) => expect(element.locator(selector)).toHaveCount(1, { timeout: await getTimeout(this) }));
+  await findWithSelector(this, selector);
 });
 
 /**
@@ -368,14 +364,14 @@ Then(`I should see an element with role {string} and name {string}`, async funct
  * */
 Then(`I should see an element with content {string}`, async function(textContent: string) {
   // 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 getPageOrElement(this).then(async (element) => expect(element.getByText(textContent, { exact: true })).toHaveCount(1, { timeout: await getTimeout(this) }));
+  await expect(await getWithContent(this, textContent)).toHaveCount(1, { timeout: await getTimeout(this) });
 });
 
 /**
  * Checks that an Html element does not exists with the specified content
  * */
 Then(`I should not see an element with content {string}`, async function(textContent: string) {
-  await getPageOrElement(this).then(async (element) => expect(element.getByText(textContent, { exact: true })).toHaveCount(0, { timeout: await getTimeout(this) }));
+  await expect(await getWithContent(this, textContent)).toHaveCount(0, { timeout: await getTimeout(this) });
 });
 
 /**
@@ -383,7 +379,7 @@ Then(`I should not see an element with content {string}`, async function(textCon
  * */
 Then(`I should see an element with testId {string}`, async function(testId: string) {
   testId = encodeURIComponent(testId);
-  await getPageOrElement(this).then(async (element) => expect(element.getByTestId(testId, { exact: true })).toHaveCount(1, { timeout: await getTimeout(this) }));
+  await findWithTestId(this, testId);
 });
 
 /**
@@ -391,7 +387,7 @@ Then(`I should see an element with testId {string}`, async function(testId: stri
  * */
 Then(`I should not see an element with testId {string}`, async function(testId: string) {
   testId = encodeURIComponent(testId);
-  await getPageOrElement(this).then(async (element) => expect(element.getByTestId(testId, { exact: true })).toHaveCount(0, { timeout: await getTimeout(this) }));
+  await expect(await getWithTestId(this, testId)).toHaveCount(0, { timeout: await getTimeout(this) });
 });
 
 /**
@@ -515,12 +511,7 @@ Then(
 Then(
  `the element with selector {string} should be keyboard focused`,
  async function(selector: string) {
-   await getPageOrElement(this).then(async (element) => {
-     const locator = element.locator(selector);
-     await locator.focus({ timeout: 10000 });
-     await expect(locator).toHaveCount(1, { timeout: await getTimeout(this) });
-     await expect(locator).toBeFocused();
-   });
+    await expect((await findWithSelector(this, selector))).toBeFocused({ timeout: await getTimeout(this) });
  });
 
 /**
@@ -548,7 +539,7 @@ Then(
  * */
 Then(`I should see an element with aria-label {string}`, async function(expectedAriaLabel: string) {
   expectedAriaLabel = encodeURIComponent(expectedAriaLabel);
-  await getPageOrElement(this).then(async (element) => expect(element.getByLabel(expectedAriaLabel, { exact: true })).toHaveCount(1, { timeout: await getTimeout(this) }));
+  await findWithAriaLabel(this, expectedAriaLabel);
 });
 
 /**
@@ -556,7 +547,7 @@ Then(`I should see an element with aria-label {string}`, async function(expected
  * */
 Then(`I should not see an element with aria-label {string}`, async function(expectedAriaLabel: string) {
   expectedAriaLabel = encodeURIComponent(expectedAriaLabel);
-  await getPageOrElement(this).then(async (element) => expect(element.getByLabel(expectedAriaLabel, { exact: true })).toHaveCount(0, { timeout: await getTimeout(this) }));
+  await expect((await getWithAriaLabel(this, expectedAriaLabel))).toHaveCount(0, { timeout: await getTimeout(this) });
 });
 
 /**
@@ -564,11 +555,8 @@ Then(`I should not see an element with aria-label {string}`, async function(expe
  * */
 Then(`I should see an element with aria-label {string} and content {string}`, async function(expectedAriaLabel: string, expectedTextContent: string) {
   expectedAriaLabel = encodeURIComponent(expectedAriaLabel);
-  await getPageOrElement(this).then(async (element) => {
-    const byLabel = element.getByLabel(expectedAriaLabel, { exact: true });
-    await expect(byLabel).toHaveCount(1, { timeout: await getTimeout(this) });
-    await expect(byLabel.filter({ hasText: expectedTextContent })).toHaveCount(1);
-  });
+  const byLabel = await findWithAriaLabel(this, expectedAriaLabel);
+  await expect(byLabel.filter({ hasText: expectedTextContent })).toHaveCount(1);
 });
 
 /**
@@ -629,7 +617,7 @@ Then(
        const attributeName = expectedAttribute[0];
        const attributeValue = expectedAttribute[1];
        // await showAttributesInLocator(element);
-       await expect(element).toHaveAttribute(attributeName, attributeValue);
+       await expect((element as Locator)).toHaveAttribute(attributeName, attributeValue);
      }
    });
  }
@@ -667,7 +655,7 @@ Then(
         await findWithRoleAndName(this, "grid", expectedListName);
         await addCookie(this, COOKIE_NAME.SELECTED_ELEMENT, new SelectedElementCookie(FILTER_TYPE.SELECTOR, `role=grid[name="${expectedListName}"]`));
         await getPageOrElement(this).then(async (element) => {
-            await expectTableToHaveContent(element, expectedElementsOfList, "gridcell");
+            await expectTableToHaveContent((element as Locator), expectedElementsOfList, "gridcell");
         });
         await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
     }
@@ -683,7 +671,7 @@ Then(
         await findWithRoleAndName(this, "treegrid", expectedListName);
         await addCookie(this, COOKIE_NAME.SELECTED_ELEMENT, new SelectedElementCookie(FILTER_TYPE.SELECTOR, `role=treegrid[name="${expectedListName}"]`));
         await getPageOrElement(this).then(async (element) => {
-            await expectTableToHaveContent(element, expectedElementsOfList, "gridcell");
+            await expectTableToHaveContent((element as Locator), expectedElementsOfList, "gridcell");
         });
         await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
     }
@@ -699,7 +687,7 @@ Then(
         await findWithRoleAndName(this, "table", expectedListName);
         await addCookie(this, COOKIE_NAME.SELECTED_ELEMENT, new SelectedElementCookie(FILTER_TYPE.SELECTOR, `role=table[name="${expectedListName}"]`));
         await getPageOrElement(this).then(async (element) => {
-            await expectTableToHaveContent(element, expectedElementsOfList, "cell");
+            await expectTableToHaveContent((element as Locator), expectedElementsOfList, "cell");
         });
         await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
     }
@@ -762,10 +750,6 @@ async function pressKey(world: World, key: string) {
   await addCookie(world, COOKIE_NAME.SELECTED_ELEMENT, new SelectedElementCookie(FILTER_TYPE.SELECTOR_PARENT, "*:focus"));
 }
 
-function keyBoardFocusTarget(world: World) {
-  return world.page.locator(":focus");
-}
-
 async function setMockAsConsumed(name: string, mock: MockCookie, world: World) {
   const newMockCookie = new MockCookie(name, mock.url, mock.verb);
   newMockCookie.isConsumed = true;
@@ -782,16 +766,3 @@ async function afterMock(world: World, url: string, verb: string, name: string)
     }
   }
 }
-
-async function type(world: World, textToType: string) {
-    const keyBoardFocusTargetObj = keyBoardFocusTarget(world);
-    if ((await keyBoardFocusTargetObj.count()) === 1) {
-        await keyBoardFocusTargetObj.type(textToType);
-    } else {
-        await getPageOrElement(world).then(async (element: Locator) => {
-            // console.debug(element);
-            await element.focus({ timeout: 10000 });
-            await element.type(textToType);
-        });
-    }
-}