Merge branch 'develop' into fb_dateAndTimeAutomation

LabKey · Mar 4, 2024 · b1f28a9 · b1f28a9
2 parents 80243ed + e41e745
commit b1f28a9
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 181 deletions.
diff --git a/data/GPAT/trial01columns1.tsv b/data/GPAT/trial01columns1.tsv
diff --git a/data/GPAT/trial01columns2.tsv b/data/GPAT/trial01columns2.tsv
diff --git a/data/GPAT/trial01columns3.tsv b/data/GPAT/trial01columns3.tsv
diff --git a/data/GPAT/trial01columns4.tsv b/data/GPAT/trial01columns4.tsv
diff --git a/src/org/labkey/test/tests/GpatAssayTest.java b/src/org/labkey/test/tests/GpatAssayTest.java
diff --git a/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java b/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java
@@ -200,13 +200,13 @@ private void createGpatAssayAndRun(String projectName, String assayName, File ru
         new WebDavUploadHelper(projectName).uploadFile(runFile);
         beginAt(WebTestHelper.buildURL("pipeline", projectName, "browse"));
         _fileBrowserHelper.importFile(runFile.getName(), "Create New Standard Assay Design");
-        waitForText(WAIT_FOR_JAVASCRIPT, "SpecimenID");
 
-        Locator assayNameTxtBox = Locator.tagWithId("input", "AssayDesignerName");
-        setFormElement(assayNameTxtBox, assayName);
-        fireEvent(assayNameTxtBox, SeleniumEvent.blur);
+        ReactAssayDesignerPage assayDesignerPage = new ReactAssayDesignerPage(getDriver());
+        assayDesignerPage.setName(assayName);
+        checker().fatal().verifyEquals("Results fields count not as expected", "8 Fields Defined",
+                assayDesignerPage.expandFieldsPanel("Results Fields").getFieldCountMessage());
+        assayDesignerPage.clickFinish();
 
-        clickButton("Begin import");
         waitAndClick(Locator.lkButton("Next"));
         waitAndClick(Locator.lkButton("Save and Finish"));
         waitAndClick(Locator.linkWithText(runFile.getName()));

diff --git a/src/org/labkey/test/util/FileBrowserHelper.java b/src/org/labkey/test/util/FileBrowserHelper.java
@@ -494,6 +494,7 @@ public void selectImportDataAction(@LoggedParam String actionName)
             actionRadioButton.check();
             assertTrue("Failed to select action: " + actionName, actionRadioButton.isSelected());
         }
+
         importWindow.clickButton("Import");
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                 actionRadioButton.check();
                 assertTrue("Failed to select action: " + actionName, actionRadioButton.isSelected());
             }
             importWindow.clickButton("Import");
         }
@@ Expand Down @@