From 3cd1966344de97207f8170752a75ca0ccc8e9286 Mon Sep 17 00:00:00 2001 From: Seth Pellegrino Date: Tue, 29 Jan 2019 17:18:06 -0800 Subject: [PATCH] DescriptionSetter: Omit description when empty Previously, there was no invocation of the buildDescription step that would set the description from a regex: the plugin would see the empty string `description` and faithfully set that ignoring the other configuration parameter. --- .../javaposse/jobdsl/dsl/helpers/step/StepContext.groovy | 4 +++- .../javaposse/jobdsl/dsl/helpers/step/StepContextSpec.groovy | 3 +-- 2 files changed, 4 insertions(+), 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 index 273259f63..7a62cb3bc 100644 --- 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 index 621751ab9..25fd5906a 100644 --- 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') }