Skip to content

[bot] Merge 25.11 to develop #1151

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
github-actions merged 2 commits into from
Dec 23, 2025
Merged

[bot] Merge 25.11 to develop #1151

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
d88737a
Wait longer for QC metrics page to load (#1148)
labkey-tchad Dec 17, 2025
c01bd40
Merge 25.11 to develop
labkey-teamcity Dec 23, 2025
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
1 change: 0 additions & 1 deletion test/src/org/labkey/test/components/targetedms/QCPlotsWebPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,6 @@ public Locator.XPathLocator getBubbleContent()
public ConfigureMetricsUIPage clickConfigureQCMetrics()
{
clickMenuItem("Configure QC Metrics");
getWrapper().waitForElement(Locator.tagWithText("button", ConfigureMetricsUIPage.ADD_NEW_CUSTOM_METRIC));
return new ConfigureMetricsUIPage(getDriver());
}

Expand Down
1 change: 0 additions & 1 deletion test/src/org/labkey/test/components/targetedms/QCSummaryWebPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ protected Elements newElementCache()
public ConfigureMetricsUIPage clickConfigureQCMetrics()
{
clickMenuItem("Configure QC Metrics");
getWrapper().waitForElement(Locator.tagWithText("button", ConfigureMetricsUIPage.ADD_NEW_CUSTOM_METRIC));
return new ConfigureMetricsUIPage(getDriver());

}
Expand Down
7 changes: 6 additions & 1 deletion test/src/org/labkey/test/pages/panoramapremium/ConfigureMetricsUIPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
import org.labkey.test.BaseWebDriverTest;
import org.labkey.test.Locator;
import org.labkey.test.components.ext4.Window;
import org.labkey.test.components.targetedms.QCPlotsWebPart;
Expand All @@ -23,6 +22,12 @@ public ConfigureMetricsUIPage(WebDriver driver)
super(driver);
}

@Override
protected void waitForPage()
{
waitForElement(Locator.tagWithText("button", ConfigureMetricsUIPage.ADD_NEW_CUSTOM_METRIC), 15_000);
}

public ConfigureMetricsUIPage setLeveyJennings(String metric, @Nullable String lowerBound, @Nullable String upperBound)
{
selectOptionByText(Locator.name(metric), "Levey-Jennings (+/- standard deviations)");
Expand Down
7 changes: 6 additions & 1 deletion test/src/org/labkey/test/tests/targetedms/TargetedMSQCConfigureMetricTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.labkey.test.pages.panoramapremium.ConfigureMetricsUIPage;
import org.labkey.test.pages.targetedms.PanoramaDashboard;
import org.labkey.test.tests.panoramapremium.TargetedMSPremiumTest;
import org.labkey.test.util.DataRegion;
import org.labkey.test.util.DataRegionTable;
import org.openqa.selenium.WebElement;

Expand Down Expand Up @@ -114,6 +113,8 @@ public void testBadMetricQuery()
@Test
public void testFixedDeviationFromMeanOption()
{
goToProjectHome();

QCPlotsWebPart.MetricType metricType = QCPlotsWebPart.MetricType.TRANSITION_AREA;
ConfigureMetricsUIPage configureQCMetrics = goToDashboard().getQcSummaryWebPart().clickConfigureQCMetrics();

Expand Down Expand Up @@ -153,6 +154,8 @@ public void testFixedDeviationFromMeanOption()
@Test
public void testFixedValueCutOffOption()
{
goToProjectHome();

QCPlotsWebPart.MetricType metric = QCPlotsWebPart.MetricType.TRANSITION_MASS_ERROR;
ConfigureMetricsUIPage configureQCMetrics = goToDashboard().getQcSummaryWebPart().clickConfigureQCMetrics();

Expand Down Expand Up @@ -185,6 +188,8 @@ public void testFixedValueCutOffOption()
@Test
public void testPlotOnlyOption()
{
goToProjectHome();

QCPlotsWebPart.MetricType metric = QCPlotsWebPart.MetricType.ISOTOPE_DOTP;
ConfigureMetricsUIPage configureQCMetrics = goToDashboard().getQcSummaryWebPart().clickConfigureQCMetrics();
configureQCMetrics.setShowMetricNoOutlier(metric);
Expand Down