Fix tests (hopefully)

jenkinsci · Jul 4, 2019 · bfc3c1e · bfc3c1e
1 parent ee10b95
commit bfc3c1e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/test/groovy/hudson/plugins/gradle/BuildScanIntegrationTest.groovy b/src/test/groovy/hudson/plugins/gradle/BuildScanIntegrationTest.groovy
@@ -59,21 +59,21 @@ class BuildScanIntegrationTest extends AbstractIntegrationTest {
 
     def 'detects build scan in pipeline log'() {
         given:
-        gradleInstallationRule.gradleVersion = '5.1'
+        gradleInstallationRule.gradleVersion = '5.5'
         gradleInstallationRule.addInstallation()
         def pipelineJob = j.createProject(WorkflowJob)
         pipelineJob.setDefinition(new CpsFlowDefinition("""
 node {
-   def gradleHome
-   stage('Preparation') {
-      gradleHome = tool '${gradleInstallationRule.gradleVersion}'
-   }
    stage('Build') {
       // Run the maven build
+      def gradleHome = tool name: '${gradleInstallationRule.gradleVersion}', type: 'gradle'
       if (isUnix()) {
          sh 'touch settings.gradle'
+         sh '''echo "buildScan { termsOfServiceUrl = 'https://gradle.com/terms-of-service'; termsOfServiceAgree = 'yes' }" > build.gradle'''
          sh "'\${gradleHome}/bin/gradle' help --scan"
       } else {
+         bat('copy /y nul settings.gradle')
+         bat('''echo "buildScan { termsOfServiceUrl = 'https://gradle.com/terms-of-service'; termsOfServiceAgree = 'yes' }" > build.gradle''')
          bat(/"\${gradleHome}\\bin\\gradle.bat" help --scan/)
       }
    }