Skip to content

Merge discvr-23.7 to develop#177

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 4 commits into from
Aug 11, 2023
Merged

Merge discvr-23.7 to develop #177

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3a95f6
Attempt to improve MCCTest (#119)
bbimber Aug 10, 2023
8e0426f
Merge discvr-23.3 to discvr-23.7
bbimber Aug 10, 2023
95e7bc4
Merge pull request #120 from bimberlabinternal/23.7_fb_merge
bbimber Aug 10, 2023
76026bc
Merge discvr-23.7 to develop
bbimber Aug 10, 2023
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
8 changes: 6 additions & 2 deletions mcc/test/src/org/labkey/test/tests/mcc/MccTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,8 +108,9 @@ private void testAnimalImportAndTransfer() throws Exception
Ext4ComboRef combo = Ext4ComboRef.getForLabel(this, "Destination Center Name");
combo.waitForStoreLoad();
sleep(200);
combo.waitForStoreLoad();
combo.clickTrigger();
waitAndClick(Locator.tagContainingText("li", "Other"));
waitAndClick(Locator.tagContainingText("li", "Other").notHidden());

Window<?> dialog = new Window.WindowFinder(getDriver()).withTitle("Enter Value").waitFor();
dialog.findElement(Locator.tag("input")).sendKeys("TargetColony");
Expand DownExpand Up@@ -163,8 +164,11 @@ private void testAnimalImportAndTransfer() throws Exception
new Window.WindowFinder(getDriver()).withTitle("Mark ID Shipped").waitFor();
Ext4FieldRef.getForLabel(this, "Effective Date").setValue(new SimpleDateFormat("MM/dd/yyyy").format(new Date()));
combo = Ext4ComboRef.getForLabel(this, "Destination Center Name");
combo.waitForStoreLoad();
sleep(200);
combo.waitForStoreLoad();
combo.clickTrigger();
waitAndClick(Locator.tagContainingText("li", "Other"));
waitAndClick(Locator.tagContainingText("li", "Other").notHidden());

dialog = new Window.WindowFinder(getDriver()).withTitle("Enter Value").waitFor();
dialog.findElement(Locator.tag("input")).sendKeys("TargetColony2");
Expand Down