Update a test and add @issue annotation for JENKINS-40594

jenkinsci · Apr 24, 2017 · c31b370 · c31b370
1 parent db8641f
commit c31b370
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStepExecution.java
@@ -71,6 +71,7 @@ public boolean start() throws Exception {
         node.addAction(new PauseAction("Input"));
 
         String baseUrl = '/' + run.getUrl() + getPauseAction().getUrlName() + '/';
+        //JENKINS-40594 submitterParameter does not work without at least one actual parameter
         if (input.getParameters().isEmpty() && (input.getSubmitterParameter() == null || input.getSubmitterParameter().isEmpty())) {
             String thisUrl = baseUrl + Util.rawEncode(getId()) + '/';
             listener.getLogger().printf("%s%n%s or %s%n", input.getMessage(),

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStepTest.java
@@ -167,7 +167,7 @@ public void test_submitters() throws Exception {
     }
 
     @Test
-    @Issue("JENKINS-31396")
+    @Issue({"JENKINS-31396","JENKINS-40594"})
     public void test_submitter_parameter() throws Exception {
         //set up dummy security real
         j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
@@ -193,6 +193,8 @@ public void test_submitter_parameter() throws Exception {
         // submit the input, and run workflow to the completion
         JenkinsRule.WebClient wc = j.createWebClient();
         wc.login("alice");
+        HtmlPage console_page = wc.getPage(b, "console");
+        assertFalse(console_page.asXml().contains("proceedEmpty"));
         HtmlPage p = wc.getPage(b, a.getUrlName());
         j.submit(p.getFormByName(is.getId()), "proceed");
         assertEquals(0, a.getExecutions().size());