Merge remote-tracking branch 'isugimpy/JENKINS-41789'

jenkinsci · Feb 9, 2017 · b28e859 · b28e859
2 parents 9fdd856 + ad16ac3
commit b28e859
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/docs/Home.md b/docs/Home.md
@@ -36,7 +36,8 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
    [JENKINS-39754](https://issues.jenkins-ci.org/browse/JENKINS-39754),
    [JENKINS-40719](https://issues.jenkins-ci.org/browse/JENKINS-40719))
  * Enhanced support for the [GitLab Plugin](https://wiki.jenkins-ci.org/display/JENKINS/GitLab+Plugin)
-   ([JENKINS-41485](https://issues.jenkins-ci.org/browse/JENKINS-41485))
+   ([JENKINS-41485](https://issues.jenkins-ci.org/browse/JENKINS-41485),
+   [JENKINS-41789](https://issues.jenkins-ci.org/browse/JENKINS-41789))
  * Fixed a problem with the plugin's dependencies 
   ([JENKINS-41001](https://issues.jenkins-ci.org/browse/JENKINS-41001))
  * Fixed a problem with Windows paths on Unix

diff --git a/...sl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/triggers/GitLabTriggerContext.groovy b/...sl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/triggers/GitLabTriggerContext.groovy
@@ -13,7 +13,7 @@ class GitLabTriggerContext extends AbstractContext {
     String excludeBranches
     String targetBranchRegex
     String rebuildOpenMergeRequest = 'never'
-    String branchFilterType = 'all'
+    String branchFilterType = 'All'
     boolean buildOnMergeRequestEvents = true
     boolean buildOnPushEvents = true
     boolean enableCiSkip = true
@@ -34,15 +34,15 @@ class GitLabTriggerContext extends AbstractContext {
      */
     void includeBranches(String includeBranches) {
         this.includeBranches = includeBranches
-        this.branchFilterType = 'nameBasedFilter'
+        this.branchFilterType = 'NameBasedFilter'
     }
 
     /**
      * Comma-separated list of source branches disabled to trigger a build from a push event.
      */
     void excludeBranches(String excludeBranches) {
         this.excludeBranches = excludeBranches
-        this.branchFilterType = 'nameBasedFilter'
+        this.branchFilterType = 'NameBasedFilter'
     }
 
     /**
@@ -54,7 +54,7 @@ class GitLabTriggerContext extends AbstractContext {
      */
     void targetBranchRegex(String targetBranchRegex) {
         this.targetBranchRegex = targetBranchRegex
-        this.branchFilterType = 'regexBasedFilter'
+        this.branchFilterType = 'RegexBasedFilter'
     }
 
     /**

diff --git a/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/triggers/TriggerContextSpec.groovy b/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/triggers/TriggerContextSpec.groovy
@@ -372,7 +372,7 @@ class TriggerContextSpec extends Specification {
             addNoteOnMergeRequest[0].value() == true
             addCiMessage[0].value() == false
             addVoteOnMergeRequest[0].value() == true
-            branchFilterType[0].value() == 'all'
+            branchFilterType[0].value() == 'All'
             includeBranchesSpec[0].value().empty
             excludeBranchesSpec[0].value().empty
             targetBranchRegex[0].value().empty
@@ -403,7 +403,7 @@ class TriggerContextSpec extends Specification {
             addNoteOnMergeRequest[0].value() == true
             addCiMessage[0].value() == false
             addVoteOnMergeRequest[0].value() == true
-            branchFilterType[0].value() == 'all'
+            branchFilterType[0].value() == 'All'
             includeBranchesSpec[0].value().empty
             excludeBranchesSpec[0].value().empty
             targetBranchRegex[0].value().empty
@@ -445,7 +445,7 @@ class TriggerContextSpec extends Specification {
             addNoteOnMergeRequest[0].value() == value
             addCiMessage[0].value() == value
             addVoteOnMergeRequest[0].value() == value
-            branchFilterType[0].value() == 'nameBasedFilter'
+            branchFilterType[0].value() == 'NameBasedFilter'
             includeBranchesSpec[0].value() == 'include1,include2'
             excludeBranchesSpec[0].value() == 'exclude1,exclude2'
             targetBranchRegex[0].value().empty
@@ -493,7 +493,7 @@ class TriggerContextSpec extends Specification {
             addNoteOnMergeRequest[0].value() == value
             addCiMessage[0].value() == value
             addVoteOnMergeRequest[0].value() == value
-            branchFilterType[0].value() == 'nameBasedFilter'
+            branchFilterType[0].value() == 'NameBasedFilter'
             includeBranchesSpec[0].value() == 'include1,include2'
             excludeBranchesSpec[0].value() == 'exclude1,exclude2'
             targetBranchRegex[0].value().empty
@@ -538,7 +538,7 @@ class TriggerContextSpec extends Specification {
             addNoteOnMergeRequest[0].value() == value
             addCiMessage[0].value() == value
             addVoteOnMergeRequest[0].value() == value
-            branchFilterType[0].value() == 'regexBasedFilter'
+            branchFilterType[0].value() == 'RegexBasedFilter'
             includeBranchesSpec[0].value().empty
             excludeBranchesSpec[0].value().empty
             targetBranchRegex[0].value() == '(.*debug.*|.*release.*)'