Merge branch 'JENKINS-36370'

Author: daspilker

docs/Home.md

@@ -27,6 +27,8 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
 
 ## Release Notes
 * 1.49 (unreleased)
+ * Enhanced support for the [Sauce OnDemand Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Sauce+OnDemand+Plugin)
+   ([JENKINS-36370](https://issues.jenkins-ci.org/browse/JENKINS-36370))
 * 1.48 (June 24 2016)
  * Added option to ignore missing DSL script files or empty wildcards
    ([JENKINS-34060](https://issues.jenkins-ci.org/browse/JENKINS-34060))

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/wrapper/SauceOnDemandContext.groovy

@@ -1,8 +1,10 @@
 package javaposse.jobdsl.dsl.helpers.wrapper
 
-import javaposse.jobdsl.dsl.Context
+import javaposse.jobdsl.dsl.AbstractContext
+import javaposse.jobdsl.dsl.JobManagement
+import javaposse.jobdsl.dsl.RequiresPlugin
 
-class SauceOnDemandContext implements Context {
+class SauceOnDemandContext extends AbstractContext {
     boolean useGeneratedTunnelIdentifier
     boolean sendUsageData
     boolean enableSauceConnect
@@ -14,9 +16,14 @@ class SauceOnDemandContext implements Context {
     String seleniumHost
     String seleniumPort
     String options
+    String credentialsId
     List<String> webDriverBrowsers = []
     List<String> appiumBrowsers = []
 
+    SauceOnDemandContext(JobManagement jobManagement) {
+        super(jobManagement)
+    }
+
     /**
      * Specifies the browsers to test with Appium. Can be called multiple times to add more browsers.
      */
@@ -31,6 +38,16 @@ class SauceOnDemandContext implements Context {
         this.webDriverBrowsers.addAll(webDriverBrowsers)
     }
 
+    /**
+     * Sets the credentials a build should use.
+     *
+     * @since 1.49
+     */
+    @RequiresPlugin(id = 'sauce-ondemand', minimumVersion = '1.148')
+    void credentials(String credentialsId) {
+        this.credentialsId = credentialsId
+    }
+
     /**
      * Sets the command line options to be included when launching Sauce Connect.
      */

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperContext.groovy

@@ -614,7 +614,7 @@ class WrapperContext extends AbstractExtensibleContext {
      */
     @RequiresPlugin(id = 'sauce-ondemand', minimumVersion = '1.142')
     void sauceOnDemand(@DslContext(SauceOnDemandContext) Closure closure) {
-        SauceOnDemandContext context = new SauceOnDemandContext()
+        SauceOnDemandContext context = new SauceOnDemandContext(jobManagement)
         ContextHelper.executeInContext(closure, context)
 
         wrapperNodes << new NodeBuilder().'hudson.plugins.sauce__ondemand.SauceOnDemandBuildWrapper' {
@@ -639,6 +639,9 @@ class WrapperContext extends AbstractExtensibleContext {
             useLatestVersion(context.useLatestVersion)
             launchSauceConnectOnSlave(context.launchSauceConnectOnSlave)
             options(context.options ?: '')
+            if (jobManagement.isMinimumPluginVersionInstalled('sauce-ondemand', '1.148')) {
+                credentialId(context.credentialsId ?: '')
+            }
             verboseLogging(context.verboseLogging)
             condition(class: 'org.jenkins_ci.plugins.run_condition.core.AlwaysRun')
         }

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/wrapper/WrapperContextSpec.groovy

@@ -1104,7 +1104,7 @@ class WrapperContextSpec extends Specification {
         1 * mockJobManagement.requirePlugin('nodejs')
     }
 
-    def 'call sauce on demand with defaults'() {
+    def 'call sauce on demand with defaults for older plugin version'() {
         when:
         context.sauceOnDemand {
         }
@@ -1131,7 +1131,41 @@ class WrapperContextSpec extends Specification {
         }
     }
 
+    def 'call sauce on demand with defaults'() {
+        given:
+        mockJobManagement.isMinimumPluginVersionInstalled('sauce-ondemand', '1.148') >> true
+
+        when:
+        context.sauceOnDemand {
+        }
+
+        then:
+        with(context.wrapperNodes[0]) {
+            name() == 'hudson.plugins.sauce__ondemand.SauceOnDemandBuildWrapper'
+            children().size() == 16
+            useGeneratedTunnelIdentifier[0].value() == false
+            sendUsageData[0].value() == false
+            nativeAppPackage[0].value() == ''
+            useChromeForAndroid[0].value() == false
+            sauceConnectPath[0].value() == ''
+            enableSauceConnect[0].value() == false
+            seleniumHost[0].value() == ''
+            seleniumPort[0].value() == ''
+            webDriverBrowsers[0].value().empty
+            appiumBrowsers[0].value().empty
+            useLatestVersion[0].value() == false
+            launchSauceConnectOnSlave[0].value() == false
+            options[0].value() == ''
+            credentialId[0].value() == ''
+            verboseLogging[0].value() == false
+            condition[0].attribute('class') == 'org.jenkins_ci.plugins.run_condition.core.AlwaysRun'
+        }
+    }
+
     def 'call sauce on demand with all options'() {
+        given:
+        mockJobManagement.isMinimumPluginVersionInstalled('sauce-ondemand', '1.148') >> true
+
         when:
         context.sauceOnDemand {
             useGeneratedTunnelIdentifier()
@@ -1148,13 +1182,14 @@ class WrapperContextSpec extends Specification {
             useLatestVersion()
             launchSauceConnectOnSlave()
             options('options')
+            credentials('credentialId')
             verboseLogging()
         }
 
         then:
         with(context.wrapperNodes[0]) {
             name() == 'hudson.plugins.sauce__ondemand.SauceOnDemandBuildWrapper'
-            children().size() == 15
+            children().size() == 16
             useGeneratedTunnelIdentifier[0].value() == true
             sendUsageData[0].value() == true
             nativeAppPackage[0].value() == 'nativeAppPackage'
@@ -1174,6 +1209,7 @@ class WrapperContextSpec extends Specification {
             useLatestVersion[0].value() == true
             launchSauceConnectOnSlave[0].value() == true
             options[0].value() == 'options'
+            credentialId[0].value() == 'credentialId'
             verboseLogging[0].value() == true
             condition[0].attribute('class') == 'org.jenkins_ci.plugins.run_condition.core.AlwaysRun'
         }