Skip to content

Merge 21.7.4 to 21.9 #105

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
github-actions merged 2 commits into from
Sep 8, 2021
Merged

Merge 21.7.4 to 21.9 #105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21a5913
Update test to match the UnauthorizedException message. (#103)
labkey-bpatel Sep 2, 2021
82c411a
Merge 21.7.4 to 21.9
labkey-teamcity Sep 8, 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
4 changes: 2 additions & 2 deletions WNPRC_Purchasing/test/src/org/labkey/test/tests/wnprc_purchasing/WNPRC_PurchasingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ public void testAdminPage() throws IOException, CommandException
goToPurchaseAdminPage();
checker().verifyTrue(REQUESTER_USER_1 + "user should not permission for admin page",
isElementPresent(Locator.tagWithClass("div", "labkey-error-subheading")
.withText("You do not have the permissions required to access this page.")));
.withText("User does not have permission to perform this operation.")));
goBack();

log("Creating request as " + REQUESTER_USER_1);
Expand Down Expand Up @@ -660,7 +660,7 @@ public void testReceiverActions()
goToPurchaseAdminPage();
checker().verifyTrue("Receiver should not have permission to access admin page",
isElementPresent(Locator.tagWithClass("div", "labkey-error-subheading")
.withText("You do not have the permissions required to access this page.")));
.withText("User does not have permission to perform this operation.")));
goToReceiverPage();
waitAndClickAndWait(Locator.linkWithText(requestId2));
requestPage = new CreateRequestPage(getDriver());
Expand Down