Skip to content

Decode reportId to avoid double-encoding later #2182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 2 commits into from
Dec 9, 2024
Merged

Decode reportId to avoid double-encoding later #2182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f66028
Decode reportId to avoid double-encoding later
labkey-tchad Dec 9, 2024
6b0e28c
Wait for new tab to be ready
labkey-tchad Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/org/labkey/test/WebDriverWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hc.client5.http.utils.URIUtils;
import org.eclipse.jetty.util.URIUtil;
import org.intellij.lang.annotations.Language;
import org.jetbrains.annotations.Contract;
Expand Down Expand Up @@ -1007,6 +1006,9 @@ public void switchToWindow(int index)
try
{
getDriver().switchTo().window(windows.get(index));
new WebDriverWait(getDriver(), Duration.ofSeconds(WAIT_FOR_PAGE))
.withMessage("waiting for document to be ready")
.until(wd -> Objects.equals(executeScript("return document.readyState;"), "complete"));
}
catch (StackOverflowError soe)
{
Expand Down Expand Up @@ -3923,6 +3925,13 @@ public String getUrlParam(String paramName, boolean decode)
return paramValue;
}

/**
* Parses the URL query of the current page
* @deprecated Duplicated in {@link WebTestHelper#parseUrlQueryString(String)}. Warning: valueless parameters are
* handled differently ({@code null} instead of {@code ""})
* @return Map of encoded URL parameters
*/
@Deprecated (since = "25.1")
public Map<String, String> getUrlParameters()
{
Map<String, String> params = new HashMap<>();
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/test/pages/reports/ScriptReportPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public String saveReport(String name, boolean isSaveAs, int wait)
{
saveReportWithName(name, isSaveAs);
}
return getUrlParam("reportId");
return getUrlParam("reportId", true);
}

/**
Expand Down
Loading