@uuv/playwright 3.61.0 → 3.62.0

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_landmark.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -71,36 +70,22 @@ Then(
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the landmark named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("landmark", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "landmark", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the landmark named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("landmark", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "landmark", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a landmark named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("landmark", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "landmark", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_link.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -81,36 +80,22 @@ When(`I click on link named {string}`, async function(name: string) {
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the link named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("link", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "link", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the link named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("link", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "link", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a link named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("link", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "link", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_list.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_listbox.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -71,36 +70,22 @@ Then(
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the list box named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("listbox", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "listbox", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the list box named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("listbox", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "listbox", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a list box named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("listbox", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "listbox", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_listitem.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -81,36 +80,22 @@ When(`I click on list item named {string}`, async function(name: string) {
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the list item named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("listitem", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "listitem", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the list item named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("listitem", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "listitem", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a list item named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("listitem", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "listitem", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_log.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -71,36 +70,22 @@ Then(
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the log named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("log", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "log", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the log named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("log", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "log", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a log named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("log", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "log", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_main.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -71,36 +70,22 @@ Then(
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the main named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("main", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "main", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the main named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("main", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "main", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a main named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("main", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "main", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_mark.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -71,36 +70,22 @@ Then(
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the mark named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("mark", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "mark", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the mark named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("mark", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "mark", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a mark named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("mark", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "mark", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_math.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -71,36 +70,22 @@ Then(
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the math named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("math", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "math", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the math named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("math", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "math", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a math named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("math", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "math", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_menu.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -71,36 +70,22 @@ Then(
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the menu named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("menu", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "menu", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the menu named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("menu", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "menu", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a menu named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("menu", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "menu", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section

package/src/cucumber/step_definitions/playwright/generated/enriched/en/_en-generated-steps-definition_menubar.ts

@@ -29,13 +29,12 @@ import {
     findWithRoleAndNameDisabled,
     findWithRoleAndNameEnabled,
     findWithRoleAndNameFocused,
-    getPageOrElement,
-    getTimeout,
     notFoundWithRoleAndName,
-    withinRoleAndName
+    withinRoleAndName,
+    type,
+    findWithRoleAndNameAndValue
 } from "../../../core-engine";
 import { Then, When } from "../../../../../preprocessor/run/world";
-import { expect } from "@playwright/test";
 
 // Begin of General Section
 
@@ -71,36 +70,22 @@ Then(
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I type the sentence {string} in the menubar named {string}`, async function(textToType: string, name: string) {
-  await getPageOrElement(this).then(async (element) => {
-    const byRole = await element.getByRole("menubar", { name: name, exact: true });
-    await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-    await byRole.type(textToType);
-    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-  });
+  await type(this, "menubar", name, textToType);
 });
 
 /**
  * Writes the sentence given as a parameter inside the specified field (useful for example to fill in a form field)
  * */
 When(`I enter the value {string} in the menubar named {string}`, async function(textToType: string, name: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("menubar", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1);
-        await byRole.type(textToType);
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await type(this, "menubar", name, textToType);
 });
 
 /**
  * key.then.element.withRoleAndNameAndValue
  * */
 When(`I should see a menubar named {string} with value {string}`, async function(name: string, expectedValue: string) {
-    await getPageOrElement(this).then(async (element) => {
-        const byRole = await element.getByRole("menubar", { name: name, exact: true });
-        await expect(byRole).toHaveCount(1, { timeout: await getTimeout(this) });
-        await expect(byRole).toHaveValue(expectedValue, { timeout: await getTimeout(this) });
-        await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
-    });
+    await findWithRoleAndNameAndValue(this, "menubar", name, expectedValue);
+    await deleteCookieByName(this, COOKIE_NAME.SELECTED_ELEMENT);
 });
 
 // End of Type Section