Skip to content

Commit d88737a

Browse files
authored
Wait longer for QC metrics page to load (#1148)
1 parent 872ae8a commit d88737a

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

test/src/org/labkey/test/components/targetedms/QCPlotsWebPart.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,6 @@ public Locator.XPathLocator getBubbleContent()
744744
public ConfigureMetricsUIPage clickConfigureQCMetrics()
745745
{
746746
clickMenuItem("Configure QC Metrics");
747-
getWrapper().waitForElement(Locator.tagWithText("button", ConfigureMetricsUIPage.ADD_NEW_CUSTOM_METRIC));
748747
return new ConfigureMetricsUIPage(getDriver());
749748
}
750749

test/src/org/labkey/test/components/targetedms/QCSummaryWebPart.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ protected Elements newElementCache()
103103
public ConfigureMetricsUIPage clickConfigureQCMetrics()
104104
{
105105
clickMenuItem("Configure QC Metrics");
106-
getWrapper().waitForElement(Locator.tagWithText("button", ConfigureMetricsUIPage.ADD_NEW_CUSTOM_METRIC));
107106
return new ConfigureMetricsUIPage(getDriver());
108107

109108
}

test/src/org/labkey/test/pages/panoramapremium/ConfigureMetricsUIPage.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.jetbrains.annotations.Nullable;
44
import org.junit.Assert;
5-
import org.labkey.test.BaseWebDriverTest;
65
import org.labkey.test.Locator;
76
import org.labkey.test.components.ext4.Window;
87
import org.labkey.test.components.targetedms.QCPlotsWebPart;
@@ -23,6 +22,12 @@ public ConfigureMetricsUIPage(WebDriver driver)
2322
super(driver);
2423
}
2524

25+
@Override
26+
protected void waitForPage()
27+
{
28+
waitForElement(Locator.tagWithText("button", ConfigureMetricsUIPage.ADD_NEW_CUSTOM_METRIC), 15_000);
29+
}
30+
2631
public ConfigureMetricsUIPage setLeveyJennings(String metric, @Nullable String lowerBound, @Nullable String upperBound)
2732
{
2833
selectOptionByText(Locator.name(metric), "Levey-Jennings (+/- standard deviations)");

test/src/org/labkey/test/tests/targetedms/TargetedMSQCConfigureMetricTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.labkey.test.pages.panoramapremium.ConfigureMetricsUIPage;
1212
import org.labkey.test.pages.targetedms.PanoramaDashboard;
1313
import org.labkey.test.tests.panoramapremium.TargetedMSPremiumTest;
14-
import org.labkey.test.util.DataRegion;
1514
import org.labkey.test.util.DataRegionTable;
1615
import org.openqa.selenium.WebElement;
1716

@@ -114,6 +113,8 @@ public void testBadMetricQuery()
114113
@Test
115114
public void testFixedDeviationFromMeanOption()
116115
{
116+
goToProjectHome();
117+
117118
QCPlotsWebPart.MetricType metricType = QCPlotsWebPart.MetricType.TRANSITION_AREA;
118119
ConfigureMetricsUIPage configureQCMetrics = goToDashboard().getQcSummaryWebPart().clickConfigureQCMetrics();
119120

@@ -153,6 +154,8 @@ public void testFixedDeviationFromMeanOption()
153154
@Test
154155
public void testFixedValueCutOffOption()
155156
{
157+
goToProjectHome();
158+
156159
QCPlotsWebPart.MetricType metric = QCPlotsWebPart.MetricType.TRANSITION_MASS_ERROR;
157160
ConfigureMetricsUIPage configureQCMetrics = goToDashboard().getQcSummaryWebPart().clickConfigureQCMetrics();
158161

@@ -185,6 +188,8 @@ public void testFixedValueCutOffOption()
185188
@Test
186189
public void testPlotOnlyOption()
187190
{
191+
goToProjectHome();
192+
188193
QCPlotsWebPart.MetricType metric = QCPlotsWebPart.MetricType.ISOTOPE_DOTP;
189194
ConfigureMetricsUIPage configureQCMetrics = goToDashboard().getQcSummaryWebPart().clickConfigureQCMetrics();
190195
configureQCMetrics.setShowMetricNoOutlier(metric);

0 commit comments

Comments
 (0)