Merge pull request #1162 from sethp-nr/bugfix/description-setter-buil…

…d-step DescriptionSetter: Omit description when empty
jenkinsci · Apr 26, 2019 · 31690d6 · 31690d6
2 parents 9b343ee + 3cd1966
commit 31690d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/step/StepContext.groovy b/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/step/StepContext.groovy
@@ -106,7 +106,9 @@ class StepContext extends AbstractExtensibleContext {
     void buildDescription(String regexp, String description = null) {
         stepNodes << new NodeBuilder().'hudson.plugins.descriptionsetter.DescriptionSetterBuilder' {
             delegate.regexp(regexp ?: '')
-            delegate.description(description ?: '')
+            if (description) {
+                delegate.description(description)
+            }
         }
     }
 

diff --git a/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/step/StepContextSpec.groovy b/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/step/StepContextSpec.groovy
@@ -139,9 +139,8 @@ class StepContextSpec extends Specification {
         then:
         with(context.stepNodes[0]) {
             name() == 'hudson.plugins.descriptionsetter.DescriptionSetterBuilder'
-            children().size() == 2
+            children().size() == 1
             regexp[0].value() == '[version] (.*)'
-            description[0].value() == ''
         }
         1 * jobManagement.requireMinimumPluginVersion('description-setter', '1.9')
     }