From f15d6ecc3cb12b8578ee1132e6b397ea37c63636 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Wed, 4 Dec 2024 11:57:37 -0800 Subject: [PATCH 1/3] Update expected description. Don't return the grid until it is ready. --- src/org/labkey/test/components/ui/pipeline/ImportsPage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/components/ui/pipeline/ImportsPage.java b/src/org/labkey/test/components/ui/pipeline/ImportsPage.java index 8e51c241e6..5f0e9f4093 100644 --- a/src/org/labkey/test/components/ui/pipeline/ImportsPage.java +++ b/src/org/labkey/test/components/ui/pipeline/ImportsPage.java @@ -56,7 +56,9 @@ public String getPageHeader() public QueryGrid getImportsGrid() { - return elementCache().pipelineJobsGrid(); + QueryGrid grid = elementCache().pipelineJobsGrid(); + waitFor(grid::isLoaded, "Imports grid did not become active in time.", 2_500); + return grid; } @Override From 50eab2bc28000085ef86ef219c5651d241b7f371 Mon Sep 17 00:00:00 2001 From: Trey Chadick Date: Wed, 4 Dec 2024 11:58:56 -0800 Subject: [PATCH 2/3] Encode URL query parameters when building a URL (#2169) Also adjust encoding for app path --- src/org/labkey/test/util/URLBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/labkey/test/util/URLBuilder.java b/src/org/labkey/test/util/URLBuilder.java index dc067e4067..c911bd3899 100644 --- a/src/org/labkey/test/util/URLBuilder.java +++ b/src/org/labkey/test/util/URLBuilder.java @@ -107,7 +107,7 @@ public URLBuilder setQuery(Map query) public URLBuilder setAppResourcePath(Object... pathParts) { List encodedParts = Arrays.stream(pathParts).map(Objects::requireNonNull).map(String::valueOf) - .map(URIUtil::encodePath).collect(Collectors.toList()); + .map(s -> EscapeUtil.encode(s).replace("+", " ")).collect(Collectors.toList()); setFragment("/" + String.join("/", encodedParts)); return this; } @@ -212,11 +212,11 @@ private void appendQueryString(StringBuilder url, Map params) if (null != param.getKey()) { url.append(firstParam ? "?" : "&"); - url.append(param.getKey()); + url.append(EscapeUtil.encode(param.getKey())); if (null != param.getValue()) { url.append("="); - url.append(param.getValue()); + url.append(EscapeUtil.encode(String.valueOf(param.getValue()))); } firstParam = false; } From 33d95b096b9a1e9ee69b6a0adcf2948c34f2ac78 Mon Sep 17 00:00:00 2001 From: Alan Vezina Date: Wed, 4 Dec 2024 14:13:39 -0600 Subject: [PATCH 3/3] Assay Results QC (#2162) Update expected CSS class names in locators --- .../labkey/test/components/ui/grids/ParentDetailPanel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java b/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java index 0ff070e9b1..f247b056e5 100644 --- a/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java +++ b/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java @@ -165,13 +165,13 @@ public Optional optionalEditBtn() public WebElement editBtn = editBtnLoc.findWhenNeeded(panelHeading); public WebElement panelBody = Locator.tagWithClass("div", "panel-body").findWhenNeeded(this); - public WebElement parentsForElement = Locator.tagWithClass("div", "bottom-spacing").child("b") + public WebElement parentsForElement = Locator.tagWithClass("div", "bottom-padding").child("b") .findWhenNeeded(panelBody); // finds a webElement that will contain the detailTable and responsiveGrid for the specified source or parent type public WebElement detailGroupContainer(String containingType) { - return Locator.tagWithClass("div", "top-spacing") + return Locator.tagWithClass("div", "top-padding") .withChild(Locator.tagWithClass("table", "detail-component--table__fixed") .withDescendant(Locator.tag("td").withChild(Locator.linkWithText(containingType)))) .waitForElement(panelBody, 2000); @@ -179,7 +179,7 @@ public WebElement detailGroupContainer(String containingType) // finds the first link in each detail table in each detailGroupContainer; used to get a list of parent types public List gridParentTypesLinks() { - Locator detailGroupContainers = Locator.tagWithClass("div", "top-spacing") + Locator detailGroupContainers = Locator.tagWithClass("div", "top-padding") .child(Locator.tagWithClass("table", "detail-component--table__fixed") .descendant(Locator.tag("td").child(Locator.tag("a")))); return detailGroupContainers.findElements(elementCache().panelBody);