Skip to content

Merge discvr-21.7 to develop #85

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
bbimber merged 8 commits into from
Aug 30, 2021
Merged

Merge discvr-21.7 to develop #85

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c54176a
Add null check to test
bbimber Jun 27, 2021
5e06124
Merge discvr-21.3 to discvr-21.7
bbimber Aug 20, 2021
1fa8c4a
Merge pull request #15 from bimberlabinternal/21.3_fb_merge
bbimber Aug 20, 2021
a534c43
Attempt to fix intermittent test failures
bbimber Aug 24, 2021
dbad6c2
Attempt to fix intermittent test failures
bbimber Aug 24, 2021
3262c46
Merge discvr-21.3 to discvr-21.7
bbimber Aug 25, 2021
744266b
Merge pull request #16 from bimberlabinternal/21.7_fb_merge
bbimber Aug 25, 2021
42ad705
Merge discvr-21.7 to develop
bbimber Aug 30, 2021
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
36 changes: 34 additions & 2 deletions LDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,24 @@

import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
import org.labkey.test.BaseWebDriverTest;
import org.labkey.test.Locator;
import org.labkey.test.WebDriverWrapper;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.Ext4Helper;
import org.labkey.test.util.UIAssayHelper;
import org.labkey.test.util.ext4cmp.Ext4CmpRef;
import org.labkey.test.util.ext4cmp.Ext4ComboRef;
import org.labkey.test.util.ext4cmp.Ext4FieldRef;
import org.labkey.test.util.ext4cmp.Ext4GridRef;
import org.openqa.selenium.TimeoutException;

import java.io.File;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Random;
import java.util.Set;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -248,8 +252,33 @@ public void goToAssayResultImport(String assayName, boolean supportsTemplates)
_test.waitForText("Data Import");
}

public String clickAndGetExampleData()
{
Locator btn = Locator.linkContainingText("Download Example Data");
_test.waitForElement(btn);
_test.waitAndClick(btn);

int iterations = 0;
while (_test.getDriver().getWindowHandles().size() < 2)
{
iterations++;
WebDriverWrapper.sleep(100);

if (iterations > 20)
{
throw new TimeoutException("Timed out waiting for second browser window");
}
}

return getExampleData();
}

public String getExampleData()
{
String ret = null;

Set<String> handles = _test.getDriver().getWindowHandles();
Assert.assertTrue("Expected more than one open window, was: " + handles.size(), handles.size() > 1);
String currentWindow = _test.getDriver().getWindowHandle();
for (String handle : _test.getDriver().getWindowHandles())
{
Expand All @@ -259,10 +288,13 @@ public String getExampleData()
String text = getPageText();
_test.getDriver().close();
_test.getDriver().switchTo().window(currentWindow);
return text;
ret = StringUtils.trimToNull(text);
}
}
return null;

Assert.assertNotNull("Unable to retrieve example data", StringUtils.trimToNull(ret));

return ret;
}

public Locator toolIcon(String name)
Expand Down