improve wait time when selecting dropdowns

matomo-org · Sep 22, 2023 · 92a2981 · 92a2981
1 parent 01552c3
commit 92a2981
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/tests/UI/form.js b/tests/UI/form.js
@@ -5,28 +5,27 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-exports.sendFieldValue = async function (page, selector, text)
-{
-    await page.evaluate((selector) => {
-        $(selector).val('').change();
-    }, selector);
+exports.sendFieldValue = async function (page, selector, text) {
+  await page.evaluate((selector) => {
+    $(selector).val('').change();
+  }, selector);
 
-    await page.waitForFunction("$('" + selector + "').val() == ''");
-    // page.sendKeys(selector, text);
+  await page.waitForFunction(() => $(selector).val() === '');
 
-    await page.evaluate((selector, text) => {
-        $(selector).val(text).change();
-    }, selector, text);
+  await page.evaluate((selector, text) => {
+    $(selector).val(text).change();
+  }, selector, text);
 
-  await page.waitForFunction("$('" + selector + "').val() != ''");
+  await page.waitForFunction(() => $(selector).val() === text);
 };
-exports.selectValue = async function (page, field, title)
-{
-    await page.evaluate((field) => {
-        $(field + ' input.select-dropdown').click()
-    }, field);
-    await page.waitForTimeout(800);
-    await page.evaluate((field, title) => {
-        $(field + ' .dropdown-content li:contains("' + title + '"):first').click()
-    }, field, title);
+exports.selectValue = async function (page, field, title) {
+  await page.evaluate((field) => {
+    $(field + ' input.select-dropdown').click()
+  }, field);
+
+  await page.waitForFunction(() => $(field + ' .dropdown-content li:contains("' + title + '")').length() > 0);
+
+  await page.evaluate((field, title) => {
+    $(field + ' .dropdown-content li:contains("' + title + '"):first').click()
+  }, field, title);
 };