diff --git a/src/org/labkey/test/components/domain/DomainFormPanel.java b/src/org/labkey/test/components/domain/DomainFormPanel.java index b51dc31e86..faf167fcb6 100644 --- a/src/org/labkey/test/components/domain/DomainFormPanel.java +++ b/src/org/labkey/test/components/domain/DomainFormPanel.java @@ -717,7 +717,7 @@ public void click() } }; - WebElement fileUploadInput = Locator.tagWithClass("input", "file-upload--input").findWhenNeeded(DomainFormPanel.this).withTimeout(2000); + WebElement fileUploadInput = Locator.tagWithClass("input", "file-upload__input").findWhenNeeded(DomainFormPanel.this).withTimeout(2000); WebElement defaultSystemFieldsContainer = Locator.tagWithClass("div", "domain-system-fields") .findWhenNeeded(this).withTimeout(WAIT_FOR_JAVASCRIPT); diff --git a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java index 876b3fd165..592cb00767 100644 --- a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java +++ b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java @@ -188,23 +188,23 @@ public String getFooterMessage() protected class ElementCache extends Component.ElementCache { public Locator dropTargetLoc = Locator.XPathLocator.union( - Locator.tagWithClass("div", "file-upload--container"), - Locator.tagWithClass("div", "file-upload--container--compact")); + Locator.tagWithClass("div", "file-upload__container"), + Locator.tagWithClass("div", "file-upload__container--compact")); public Locator labelLoc = Locator.XPathLocator.union( - Locator.tagWithClass("label", "file-upload--label"), - Locator.tagWithClass("label", "file-upload--label--compact")); - public FileInput fileInput = Input.FileInput(Locator.tagWithClass("input", "file-upload--input"), getDriver()) + Locator.tagWithClass("label", "file-upload__label"), + Locator.tagWithClass("label", "file-upload__label--compact")); + public FileInput fileInput = Input.FileInput(Locator.tagWithClass("input", "file-upload__input"), getDriver()) .findWhenNeeded(this); - public WebElement fileEntryList = Locator.tagWithClass("div", "file-upload--file-entry-listing") + public WebElement fileEntryList = Locator.tagWithClass("div", "file-upload__file-entry-listing") .findWhenNeeded(this); public Locator uploadAlertLoc = Locator.tagWithClass("div", "alert"); - public Locator fileUploadScrollFooterLoc = Locator.tagWithClass("div", "file-upload--scroll-footer"); + public Locator fileUploadScrollFooterLoc = Locator.tagWithClass("div", "file-upload__scroll-footer"); } public static class FileAttachmentContainerFinder extends WebDriverComponentFinder { - private final Locator.XPathLocator _baseLocator = Locator.tagWithClass("div", "file-upload--container").parent("div"); + private final Locator.XPathLocator _baseLocator = Locator.tagWithClass("div", "file-upload__container").parent("div"); private String _inputName = null; private String _label = null; @@ -235,10 +235,10 @@ protected FileAttachmentContainer construct(WebElement el, WebDriver driver) protected Locator locator() { if (_inputName != null) - return _baseLocator.withDescendant(Locator.tagWithClass("input", "file-upload--input") + return _baseLocator.withDescendant(Locator.tagWithClass("input", "file-upload__input") .withAttribute("name", _inputName)); else if (_label != null) - return Locator.tagWithClass("label", "file-upload--label") + return Locator.tagWithClass("label", "file-upload__label") .withAttributeMatchingOtherElementAttribute("name", Locator.tag("label").withText(_label), "for") .parent("*"); else diff --git a/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java b/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java index 2565d0546c..749ac3a625 100644 --- a/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java +++ b/src/org/labkey/test/components/ui/files/FileAttachmentEntry.java @@ -73,17 +73,17 @@ protected ElementCache elementCache() protected class ElementCache extends Component.ElementCache { - public Locator removeIconLoc = Locator.tagWithClass("span", "file-upload__remove--icon"); + public Locator removeIconLoc = Locator.byClass("attached-file__remove-icon"); public WebElement removeIcon = removeIconLoc.findWhenNeeded(this); - public WebElement fileIcon = Locator.tagWithClass("span", "attached-file--icon").findWhenNeeded(this); + public WebElement fileIcon = Locator.byClass("attached-file__icon").findWhenNeeded(this); } public static class FileAttachmentEntryFinder extends WebDriverComponentFinder { private final Locator.XPathLocator _baseLocator = Locator.XPathLocator.union( - Locator.tagWithClass("div", "attached-file--container"), - Locator.tagWithClass("div", "attached-file--inline-container")); + Locator.tagWithClass("div", "attached-file__container"), + Locator.tagWithClass("div", "attached-file__inline-container")); private String _title = null; public FileAttachmentEntryFinder(WebDriver driver) diff --git a/src/org/labkey/test/components/ui/files/FileUploadField.java b/src/org/labkey/test/components/ui/files/FileUploadField.java index bb134e6f5a..4608e55239 100644 --- a/src/org/labkey/test/components/ui/files/FileUploadField.java +++ b/src/org/labkey/test/components/ui/files/FileUploadField.java @@ -78,11 +78,11 @@ protected class ElementCache extends Component.ElementCache // Elements when no attachment is set WebElement fileInputLabel = Locator.tagWithClass("label", "file-upload--compact-label") .refindWhenNeeded(this); - WebElement fileInput = Locator.tagWithClass("input", "file-upload--input") + WebElement fileInput = Locator.tagWithClass("input", "file-upload__input") .refindWhenNeeded(this); // Elements for new attachment - WebElement tempFileLoc = Locator.tagWithClass("div", "attached-file--inline-container") + WebElement tempFileLoc = Locator.tagWithClass("div", "attached-file__inline-container") .refindWhenNeeded(this); WebElement removeBtn = Locator.tagWithClass("span", "file-upload__remove--icon") .refindWhenNeeded(this); diff --git a/src/org/labkey/test/components/ui/files/FileUploadPanel.java b/src/org/labkey/test/components/ui/files/FileUploadPanel.java index 1220f28a88..d6cbe78a8b 100644 --- a/src/org/labkey/test/components/ui/files/FileUploadPanel.java +++ b/src/org/labkey/test/components/ui/files/FileUploadPanel.java @@ -101,7 +101,7 @@ FileInput fileUploadInput() return Input.FileInput(Locator.id("fileUpload"), getDriver()).waitFor(this); } - Locator.XPathLocator attachedFileContainer = Locator.tagWithClass("div", "attached-file--container") + Locator.XPathLocator attachedFileContainer = Locator.tagWithClass("div", "attached-file__container") .withChild(Locator.tagWithClass("span", "fa-times-circle")); WebElement downloadTemplate = Locator.linkWithTitle("Download Template").findWhenNeeded(getDriver()); @@ -120,7 +120,7 @@ WebElement removeBtn(String fileName) public static class FileUploadPanelFinder extends WebDriverComponentFinder { - private final Locator.XPathLocator _baseLocator = Locator.tagWithClass("div", "file-upload--container").parent(); + private final Locator.XPathLocator _baseLocator = Locator.tagWithClass("div", "file-upload__container").parent(); public FileUploadPanelFinder(WebDriver driver) { diff --git a/src/org/labkey/test/pages/ReactAssayDesignerPage.java b/src/org/labkey/test/pages/ReactAssayDesignerPage.java index 9b4caa1226..5db27e4921 100644 --- a/src/org/labkey/test/pages/ReactAssayDesignerPage.java +++ b/src/org/labkey/test/pages/ReactAssayDesignerPage.java @@ -242,7 +242,7 @@ private ReactAssayDesignerPage setTransformScript(File transformScript, boolean String targetPath = transformScript.getAbsolutePath(); if (usingFileUpload) { - getWrapper().setFormElement(Locator.tagWithClass("input", "file-upload--input"), transformScript); + getWrapper().setFormElement(Locator.tagWithClass("input", "file-upload__input"), transformScript); targetPath = "/@scripts/" + transformScript.getName(); } else diff --git a/src/org/labkey/test/pages/core/login/CompactFileUploadField.java b/src/org/labkey/test/pages/core/login/CompactFileUploadField.java index 447d58eafb..331b362089 100644 --- a/src/org/labkey/test/pages/core/login/CompactFileUploadField.java +++ b/src/org/labkey/test/pages/core/login/CompactFileUploadField.java @@ -43,7 +43,7 @@ public CompactFileUploadField removeFile() public boolean hasAttachedFile() { - return Locator.tagWithClass("div", "attached-file--container") + return Locator.tagWithClass("div", "attached-file__container") .existsIn(this); } @@ -51,7 +51,7 @@ public String getAttachedFileName() { if (hasAttachedFile()) { - return Locator.tagWithClass("div", "attached-file--container") + return Locator.tagWithClass("div", "attached-file__container") .waitForElement(this, 2000).getText(); } else @@ -98,7 +98,7 @@ protected ElementCache newElementCache() protected class ElementCache extends Component.ElementCache { - WebElement logoFileInput = Locator.tagWithClass("input", "file-upload--input") + WebElement logoFileInput = Locator.tagWithClass("input", "file-upload__input") .refindWhenNeeded(this).withTimeout(4000); WebElement removeBtn = Locator.tagWithClass("span", "file-upload__remove--icon") @@ -106,7 +106,7 @@ protected class ElementCache extends Component.ElementCache Locator attachedFile(File file) { - return Locator.tagWithClass("div", "attached-file--container").containing(file.getName()); + return Locator.tagWithClass("div", "attached-file__container").containing(file.getName()); } } diff --git a/src/org/labkey/test/pages/core/login/SsoLogoInputPanel.java b/src/org/labkey/test/pages/core/login/SsoLogoInputPanel.java index 544042cc53..d571b5a1c3 100644 --- a/src/org/labkey/test/pages/core/login/SsoLogoInputPanel.java +++ b/src/org/labkey/test/pages/core/login/SsoLogoInputPanel.java @@ -58,9 +58,9 @@ protected ElementCache newElementCache() protected class ElementCache extends WebDriverComponent.ElementCache { - WebElement logoFileInputContainer = Locator.tagWithClass("div", "file-upload--container") + WebElement logoFileInputContainer = Locator.tagWithClass("div", "file-upload__container") .refindWhenNeeded(this).withTimeout(4000); - WebElement logoFileInput = Locator.tagWithClass("input", "file-upload--input") + WebElement logoFileInput = Locator.tagWithClass("input", "file-upload__input") .refindWhenNeeded(this).withTimeout(4000); WebElement logoImageContainer = Locator.byClass("sso-fields__image-holder") .refindWhenNeeded(this).withTimeout(4000); @@ -69,7 +69,7 @@ protected class ElementCache extends WebDriverComponent.ElementCache Locator attachedFile(File file) { - return Locator.tagWithClass("div", "attached-file--container").containing(file.getName()); + return Locator.tagWithClass("div", "attached-file__container").containing(file.getName()); } Locator fileDropLoc = Locator.tagWithClass("div", "sso-fields__file-attachment"); }