diff --git a/pom.xml b/pom.xml index cab1e874..43a01919 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,9 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin - 2.454 + + 2.462 + ${jenkins.baseline}.1 false 5.2 true @@ -58,8 +60,8 @@ io.jenkins.tools.bom - bom-2.440.x - 2982.vdce2153031a_0 + bom-${jenkins.baseline}.x + 3276.vcd71db_867fb_2 import pom diff --git a/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly b/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly index 098102fe..ea9408ac 100644 --- a/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly +++ b/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly @@ -53,25 +53,6 @@ THE SOFTWARE. - -
-
- ${%disabled(it.pronoun)} - - - - -
-
- -
-
- - - -
-
-
diff --git a/src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java b/src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java index 01807137..19cf5afe 100644 --- a/src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java +++ b/src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java @@ -609,45 +609,6 @@ public void renameWhileComputing() throws Exception { waitUntilNoActivityIgnoringThreadDeathUpTo(10000); d.checkRename("d2"); } - - @Issue("JENKINS-60900") - @Test - public void enabledAndDisableFromUi() throws Exception { - SampleComputedFolder folder = r.jenkins.createProject(SampleComputedFolder.class, "d"); - assertFalse("by default, a folder is disabled", folder.isDisabled()); - HtmlForm cfg = (HtmlForm)r.createWebClient().getPage(folder).getElementById("disable-project"); - assertNotNull(cfg); - // Disable the folder - r.submit(cfg); - assertTrue(folder.isDisabled()); - cfg = (HtmlForm)r.createWebClient().getPage(folder).getElementById("enable-project"); - assertNotNull(cfg); - // Re enable the folder - r.submit(cfg); - assertFalse(folder.isDisabled()); - } - - @Issue("JENKINS-66168") - @Test - public void enabledAndDisableFromUiViews() throws Exception { - LockedDownSampleComputedFolder folder = r.jenkins.createProject(LockedDownSampleComputedFolder.class, "d"); - assertFalse("by default, a folder is disabled", folder.isDisabled()); - folder.getViews().forEach(view -> { - try { - String viewUrl =view.getViewUrl(); - HtmlForm cfg = (HtmlForm) r.createWebClient().goTo(viewUrl).getElementById("disable-project"); - assertNotNull(cfg); - r.submit(cfg); - assertTrue("Can disable from view " + view.getViewName(), folder.isDisabled()); - cfg = (HtmlForm) r.createWebClient().goTo(viewUrl).getElementById("enable-project"); - assertNotNull(cfg); - r.submit(cfg); - assertFalse("Can enable from view " + view.getViewName(), folder.isDisabled()); - } catch (Exception e) { - Assert.fail(); - } - }); - } @Test public void failAllDeletedOnes() throws Exception {