[FIX JENKINS-41457] Use BUILD_NOW_TEXT for parameterised jobs

jenkinsci · Feb 6, 2017 · 7b82a30 · 7b82a30
1 parent 92720ab
commit 7b82a30
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
@@ -278,7 +278,8 @@ public static final CauseAction getBuildCause(ParameterizedJob job, StaplerReque
      * Uses {@link #BUILD_NOW_TEXT}.
      */
     public final String getBuildNowText() {
-        return isParameterized() ? Messages.ParameterizedJobMixIn_build_with_parameters() : AlternativeUiTextProvider.get(BUILD_NOW_TEXT, asJob(), Messages.ParameterizedJobMixIn_build_now());
+        return isParameterized() ? AlternativeUiTextProvider.get(BUILD_NOW_TEXT, asJob(), Messages.ParameterizedJobMixIn_build_with_parameters())
+                : AlternativeUiTextProvider.get(BUILD_NOW_TEXT, asJob(), Messages.ParameterizedJobMixIn_build_now());
     }
 
     /**

diff --git a/test/src/test/java/hudson/util/AlternativeUiTextProviderTest.java b/test/src/test/java/hudson/util/AlternativeUiTextProviderTest.java
@@ -25,6 +25,8 @@
 
 import hudson.model.AbstractProject;
 import hudson.model.FreeStyleProject;
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
 import jenkins.model.ParameterizedJobMixIn;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
@@ -58,9 +60,27 @@ public static class Impl extends AlternativeUiTextProvider {
      */
     @Test
     public void basics() throws Exception {
+        Impl.oldschool = false;
         FreeStyleProject p = j.createFreeStyleProject("aaa");
         assertThat(j.createWebClient().getPage(p).asText(), containsString("newschool:aaa"));
+
         Impl.oldschool = true;
         assertThat(j.createWebClient().getPage(p).asText(), containsString("oldschool:aaa"));
     }
+
+    /**
+     * Makes sure that {@link AlternativeUiTextProvider} actually works with a parameterized Job.
+     */
+    @Test
+    public void basicsWithParameter() throws Exception {
+        Impl.oldschool = false;
+        FreeStyleProject p = j.createFreeStyleProject("aaa");
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("FOO", null)));
+        String pageText = j.createWebClient().getPage(p).asText();
+        assertThat(pageText, containsString("newschool:aaa"));
+
+        Impl.oldschool = true;
+        pageText = j.createWebClient().getPage(p).asText();
+        assertThat(pageText, containsString("oldschool:aaa"));
+    }
 }