Fixes

DataBiosphere · Sep 26, 2024 · aaf8c38 · aaf8c38
1 parent 8d8a4b3
commit aaf8c38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/integration-tests/tests/register-user.js b/integration-tests/tests/register-user.js
@@ -80,7 +80,7 @@ const testRegisterUserFn = withUser(async ({ page, testUrl, token }) => {
 
   await assertLabelledTextInputValue(page, label({ labelContains: 'Contact Email' }), 'ltcommanderdata@neighborhood.horse');
 
-  const registrationEmailDiv = await page.waitForSelector("(xpath///div[.='Email']/following-sibling::div)");
+  const registrationEmailDiv = await page.waitForSelector("xpath///div[.='Email']/following-sibling::div");
   const registrationEmail = registrationEmailDiv?.evaluate((d) => d.value);
   const contactEmail = await getLabelledTextInputValue(page, label({ labelContains: 'Contact Email' }));
 

diff --git a/integration-tests/tests/request-access.js b/integration-tests/tests/request-access.js
@@ -5,7 +5,7 @@ const { registerTest } = require('../utils/jest-utils');
 const { withUserToken } = require('../utils/terra-sa-utils');
 
 async function getHrefFromClickable(page, selector) {
-  return (await (await page.waitForSelector(clickable(`xpath/${selector}`), _.defaults({ visible: true }))).getProperty('href')).jsonValue();
+  return (await (await page.waitForSelector(`xpath/${clickable(selector)}`, _.defaults({ visible: true }))).getProperty('href')).jsonValue();
 }
 
 const dbGapUrlRoot = 'https://www.ncbi.nlm.nih.gov/projects/gap/cgi-bin/study.cgi?study_id=';

diff --git a/integration-tests/utils/integration-utils.js b/integration-tests/utils/integration-utils.js
@@ -375,10 +375,10 @@ const findButtonInDialogByAriaLabel = (page, ariaLabelText) => {
 
 /** Waits for a menu element to expand (or collapse if isExpanded=false) */
 const waitForMenu = (page, { labelContains, isExpanded = true, ...options }) => {
-  return page.waitForSelector(
-    `xpath///*[contains(@aria-label,"${labelContains}") or @id=//label[contains(normalize-space(.),"${labelContains}")]/@for or @aria-labelledby=//*[contains(normalize-space(.),"${labelContains}")]/@id][@aria-expanded="${isExpanded}"]`,
-    defaultToVisibleTrue(options)
-  );
+  const labelContainsSelector = `[aria-label*="${labelContains}"], [id="${labelContains}"], [aria-labelledby*="${labelContains}"]`;
+  const expandedSelector = `[aria-expanded="${isExpanded}"]`;
+
+  return page.waitForSelector(`${labelContainsSelector}${expandedSelector}`, defaultToVisibleTrue(options));
 };
 
 const openError = async (page) => {