JENKINS-46836 Convert parameterResolver null return value to empty st…

…ring.
jenkinsci · Apr 21, 2018 · 9375c1b · 9375c1b
1 parent a41c2ad
commit 9375c1b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...ionTest/groovy/com/ceilfors/jenkins/plugins/jiratrigger/JiraTriggerIntegrationTest.groovy b/...ionTest/groovy/com/ceilfors/jenkins/plugins/jiratrigger/JiraTriggerIntegrationTest.groovy
@@ -109,6 +109,25 @@ class JiraTriggerIntegrationTest extends Specification {
         build.getEnvironment(TaskListener.NULL).get('JIRA_ISSUE_KEY') == 'TEST-1234'
     }
 
+    @Issue('JENKINS-46836')
+    def 'Should be able to set parameter mapping when value resolved is null'() {
+        given:
+        def issue = TestUtils.createIssue('TEST-1234')
+        def project = jenkins.createJiraCommentTriggeredProject('job')
+        jenkins.quietPeriod = 0
+        project.addParameterMapping('ASSIGNEE', 'assignee')
+
+        when:
+        def scheduledProjects = jenkins.jiraTriggerExecutor.scheduleBuilds(
+                issue, TestUtils.createComment(JiraCommentTrigger.DEFAULT_COMMENT))
+
+        then:
+        issue.assignee == null
+        scheduledProjects.size() != 0
+        AbstractBuild build = jenkins.getScheduledBuild(scheduledProjects[0])
+        build.getEnvironment(TaskListener.NULL).get('ASSIGNEE') == ''
+    }
+
     @Issue('JENKINS-41878')
     def 'Should not serialize any Atlassian issue object into build.xml'() {
         given:

diff --git a/src/main/groovy/com/ceilfors/jenkins/plugins/jiratrigger/ParameterMappingAction.groovy b/src/main/groovy/com/ceilfors/jenkins/plugins/jiratrigger/ParameterMappingAction.groovy
@@ -12,7 +12,7 @@ class ParameterMappingAction extends ParametersAction {
 
     ParameterMappingAction(Issue issue, List<ParameterMapping> parameterMappings) {
         super(parameterMappings.collect { p ->
-            new StringParameterValue(p.jenkinsParameter, p.parameterResolver.resolve(issue))
+            new StringParameterValue(p.jenkinsParameter, p.parameterResolver.resolve(issue) ?: '')
         }, parameterMappings*.jenkinsParameter)
     }
 }