diff --git a/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/Security2033Test.java b/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/Security2033Test.java index 33716780c..e2056e0cc 100644 --- a/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/Security2033Test.java +++ b/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/Security2033Test.java @@ -40,6 +40,7 @@ import org.htmlunit.Page; import org.htmlunit.WebResponse; import org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; @@ -62,6 +63,12 @@ class Security2033Test { private WorkflowMultiBranchProject pr; + @BeforeAll + static void enableManagePermission() { + // TODO remove when baseline contains https://github.com/jenkinsci/jenkins/pull/23873 + Jenkins.MANAGE.setEnabled(true); + } + @BeforeEach void setup(JenkinsRule rule) throws Exception { j = rule; @@ -151,7 +158,7 @@ void doShowStatsWhenUserWithoutAdminPermissionThenReturnForbiddenStatus() { try (ACLContext aclContext = ACL.as(User.getOrCreateByIdOrFullName(NOT_AUTHORIZED_USER))) { assertThatThrownBy(() -> descriptor.doShowStats()) .isInstanceOf(AccessDeniedException3.class) - .hasMessage(NOT_AUTHORIZED_USER + " is missing the Overall/Administer permission"); + .hasMessage(NOT_AUTHORIZED_USER + " is missing the Overall/Manage permission"); } } @@ -162,7 +169,7 @@ void doClearWhenUserWithoutAdminPermissionThenReturnForbiddenStatus() { try (ACLContext aclContext = ACL.as(User.getOrCreateByIdOrFullName(NOT_AUTHORIZED_USER))) { assertThatThrownBy(() -> descriptor.doClear()) .isInstanceOf(AccessDeniedException3.class) - .hasMessage(NOT_AUTHORIZED_USER + " is missing the Overall/Administer permission"); + .hasMessage(NOT_AUTHORIZED_USER + " is missing the Overall/Manage permission"); } } diff --git a/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfigurationTest.java b/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfigurationTest.java index be5ff3350..c3c98e0ec 100644 --- a/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfigurationTest.java +++ b/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfigurationTest.java @@ -73,6 +73,12 @@ class BitbucketEndpointConfigurationTest { private static JenkinsRule r; + @BeforeAll + static void enableManagePermission() { + // TODO remove when baseline contains https://github.com/jenkinsci/jenkins/pull/23873 + Jenkins.MANAGE.setEnabled(true); + } + @BeforeAll static void init(JenkinsRule rule) { r = rule; @@ -131,7 +137,7 @@ void given__newInstance__when__configuredAsAnon__then__permissionError() { assertThatThrownBy(() -> instance.setEndpoints(List.of(buildCloudEndpoint(true, "first"), buildCloudEndpoint(true, "second"), buildCloudEndpoint(true, "third"))) ) - .hasMessage(hudson.security.Messages.AccessDeniedException2_MissingPermission("anonymous", "Overall/Administer")); + .hasMessage(hudson.security.Messages.AccessDeniedException2_MissingPermission("anonymous", "Overall/Manage")); } finally { r.jenkins.setAuthorizationStrategy(AuthorizationStrategy.UNSECURED); }