Skip to content

increment number to account for attachment as well as wiki #2724

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
labkey-chrisj merged 2 commits into from
Oct 4, 2025
Merged

increment number to account for attachment as well as wiki #2724

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef00fd0
increment number to account for attachment as well as wiki
labkey-chrisj Oct 2, 2025
d7fd5c6
added synchronization
labkey-chrisj Oct 3, 2025
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
12 changes: 7 additions & 5 deletions src/org/labkey/test/tests/wiki/WikiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@ public void testDeleteUndeleteAttachment() throws IOException
wikiHelper.setWikiBody("<p>" + wikiContent + "</p>");
wikiHelper.saveWikiPage();
numberOfWikiCreated++;
clickAndWait(wikiPageLinkLoc);
waitAndClickAndWait(wikiPageLinkLoc);

log("adding an attachment");
clickAndWait(editLinkLoc);
waitAndClickAndWait(editLinkLoc);
click(filePickerLinkLoc);
setFormElement(fileInputLoc, testAttachment);
waitForElement(removeLinkLoc); // when just attached, 'remove' will be an option but delete will not be
Expand All @@ -287,7 +287,7 @@ public void testDeleteUndeleteAttachment() throws IOException
clickAndWait(wikiPageLinkLoc);

log("Deleting attachment");
clickAndWait(editLinkLoc);
waitAndClickAndWait(editLinkLoc);
click(deleteLinkLoc);
waitForElement(attachmentParentLoc.withAttributeContaining("style", "text-decoration: line-through"));
wikiHelper.saveWikiPage();
Expand All @@ -297,21 +297,23 @@ public void testDeleteUndeleteAttachment() throws IOException

log("prepare to delete/undelete attachment");
// re-attach the file and save
clickAndWait(editLinkLoc);
waitAndClickAndWait(editLinkLoc);
click(filePickerLinkLoc);
setFormElement(fileInputLoc, testAttachment);
wikiHelper.saveWikiPage();
clickAndWait(wikiPageLinkLoc);

log("Un-Deleting attachment");
clickAndWait(editLinkLoc);
waitAndClickAndWait(editLinkLoc);
click(deleteLinkLoc); // delete
waitForElement(attachmentParentLoc.withAttributeContaining("style", "text-decoration: line-through"));
waitAndClick(undeleteLinkLoc);
checker().awaiting(Duration.ofMillis(500), ()-> Assertions.assertThat(attachmentParentLoc.findElement(getDriver()).getAttribute("style"))
.as("expect strikethrough style not to be present")
.doesNotContain("text-decoration: line-through"));
wikiHelper.saveWikiPage();
// note: attaching the file and leaving it there will create a search result, so increment wikiCreated count here
numberOfWikiCreated++;

// verify save after undelete persists the attachment
assertElementPresent(Locator.linkWithText(fileName));
Expand Down