Merge pull request #29 from AOEpeople/spock2_support

Add Spock 2.0 support (WIP)
AOEpeople · May 21, 2020 · 72443df · 72443df
2 parents 646a391 + 60b8052
commit 72443df
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.3.0-RC1
+
+* Add support for:
+  * spock-core 2.0-M2
+  * spock-reports 2.0-RC2
+  * Groovy 3
+
 ## v0.2.6
 
 * Replace whitespace with underscore in Geb artifact files (#25)

diff --git a/README.md b/README.md
@@ -31,25 +31,32 @@ Add dependencies.
 
 ```groovy
 dependencies {
-    testCompile 'com.aoe:geb-spock-reports:0.2.6'
+    testCompile 'com.aoe:geb-spock-reports:0.3.0-RC1'
     
     // required spock libraries
-    testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-4"
-    testCompile ("com.athaydes:spock-reports:1.6.0") { transitive = false }
+    testCompile "org.spockframework:spock-core:2.0-M2-groovy-3.0"
+    testCompile ("com.athaydes:spock-reports:2.0-RC2") { transitive = false }
     
     // required geb libraries
-    testCompile "org.gebish:geb-spock:2.2"
+    testCompile "org.gebish:geb-spock:3.4"
     
     // you may also need selenium support
-    testCompile "org.seleniumhq.selenium:selenium-firefox-driver:3.9.1"
-    testCompile "org.seleniumhq.selenium:selenium-support:3.9.1"
+    testCompile "org.seleniumhq.selenium:selenium-firefox-driver:3.11.0"
+    testCompile "org.seleniumhq.selenium:selenium-support:3.11.0"
     
     // recommended for logging
-    testCompile 'org.slf4j:slf4j-api:1.7.13'
-    testCompile 'org.slf4j:slf4j-simple:1.7.13'
+    testCompile 'org.slf4j:slf4j-api:1.7.30'
+    testCompile 'org.slf4j:slf4j-simple:1.7.30'
 }
 ```
 
+## Compatibility
+
+| geb-spock-reports | spock-reports | spock-core  | Groovy   |
+|-------------------|---------------|-------------|----------|
+| 0.3.0-RC1         | 2.0-RC2       | 2.0-M2      | 3.0.*    |
+| 0.2.6             | 1.6.0         | 1.1         | 2.4.*    |
+
 ## Configuration
 
 ### Configure Geb

diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 plugins {
-    id 'nebula.project' version '5.1.2'
-    id 'nebula.release' version '8.0.3'
-    id 'nebula.nebula-bintray' version '4.0.2'
-    id 'com.jfrog.artifactory' version '4.7.5'
+    id "com.jfrog.bintray" version "1.8.5"
+    id "maven-publish"
+    id "java-library"
 }
 
 group 'com.aoe'
+version = '0.3.0-RC1'
 apply plugin: 'groovy'
 
 repositories {
@@ -14,35 +14,73 @@ repositories {
 }
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.4.12'
-    compile 'org.gebish:geb-core:2.2'
+    compile 'org.codehaus.groovy:groovy-all:3.0.3'
+    compile 'org.gebish:geb-core:3.4'
     compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
 }
 
-contacts {
-    '[email protected]' {
-        moniker 'Tilman Ginzel'
-        github 'tilmanginzel'
-    }
-}
-
 def projectUrl = 'https://github.com/AOEpeople/geb-spock-reports'
 
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
 bintray {
-    if (project.hasProperty('bintrayUser')) {
-        user = project.property('bintrayUser')
-        key = project.property('bintrayKey')
-    }
+    user = System.getenv('BINTRAY_USER')
+    key = System.getenv('BINTRAY_KEY')
 
     dryRun = false
     publish = false
+    publications = ['maven']
+
     pkg {
         repo = 'libraries'
+        name = 'geb-spock-reports'
         userOrg = 'aoepeople'
         websiteUrl = projectUrl
+        githubRepo = projectUrl
+        githubReleaseNotesFile = "$projectUrl/blob/master/README.md"
         issueTrackerUrl = "$projectUrl/issues"
         vcsUrl = "$projectUrl/.git"
         licenses = ['Apache-2.0']
         labels = ['spock', 'geb', 'spock-reports', 'testing', 'reports']
+        version {
+            name = project.version
+            released = new Date()
+            vcsTag = "v${project.version}"
+        }
     }
-}
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            groupId = 'com.aoe'
+            artifactId = 'geb-spock-reports'
+            version = project.version
+            pom {
+                name = 'geb-spock-reports'
+                description = 'Integrates Geb screenshots into the spock-reports library '
+                url = 'https://github.com/AOEpeople/geb-spock-reports'
+                licenses {
+                    license {
+                        name = 'The Apache License, Version 2.0'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'tilmanginzel'
+                        name = 'Tilman Ginzel'
+                        email = '[email protected]'
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+bintrayUpload.dependsOn build
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.energizedwork.webdriver-binaries" version "1.4"
+    id "eu.leontebbens.gradle.chromedriver-updater" version "1.6.2"
 }
 apply plugin: 'groovy'
 apply plugin: 'application'
@@ -13,25 +13,30 @@ dependencies {
     testCompile rootProject
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-4"
+    testCompile "org.spockframework:spock-core:2.0-M2-groovy-3.0"
 
-    testCompile "org.gebish:geb-spock:2.2"
-    testCompile ("com.athaydes:spock-reports:1.6.0") { transitive = false }
+    testCompile "org.gebish:geb-spock:3.4"
+    testCompile("com.athaydes:spock-reports:2.0-RC2") { transitive = false }
 
-    testCompile 'org.slf4j:slf4j-api:1.7.13'
-    testCompile 'org.slf4j:slf4j-simple:1.7.13'
+    testCompile 'org.slf4j:slf4j-api:1.7.30'
+    testCompile 'org.slf4j:slf4j-simple:1.7.30'
 
-    testCompile "org.seleniumhq.selenium:selenium-chrome-driver:3.9.1"
-    testCompile "org.seleniumhq.selenium:selenium-firefox-driver:3.9.1"
-    testCompile "org.seleniumhq.selenium:selenium-support:3.9.1"
+    testCompile "org.seleniumhq.selenium:selenium-chrome-driver:3.11.0"
+    testCompile "org.seleniumhq.selenium:selenium-firefox-driver:3.11.0"
+    testCompile "org.seleniumhq.selenium:selenium-support:3.11.0"
 }
 
-webdriverBinaries {
-    chromedriver '2.36'
+chromedriver {
+    majorVersion = "83"
 }
 
 test {
+    dependsOn updateChromedriver
+
     testLogging {
         showStandardStreams = true
     }
+
+    useJUnitPlatform()
+    systemProperty 'webdriver.chrome.driver', "${updateChromedriver.driverLocation}"
 }
diff --git a/src/main/resources/templates/spec-template.html b/src/main/resources/templates/spec-template.html
@@ -168,7 +168,7 @@ <h2>Features</h2>
         <span class="feature-name feature-name-$cssClass">$name</span>
 
         <%
-        def ignoreReason = description.getAnnotation(spock.lang.Ignore)?.value()
+        def ignoreReason = utils.featureAnnotation(delegate, spock.lang.Ignore)?.value()
         if (ignoreReason) { %>
         <p class="ignore-reason">$ignoreReason</p>
         <% } %>
@@ -189,8 +189,8 @@ <h2>Features</h2>
 
     <!-- print name and issue/see annotation-->
     <%
-    writeIssuesOrSees(description.getAnnotation(spock.lang.Issue), 'Issues')
-    writeIssuesOrSees(description.getAnnotation(spock.lang.See), 'See')
+    writeIssuesOrSees(utils.featureAnnotation(delegate, spock.lang.Issue), 'Issues')
+    writeIssuesOrSees(utils.featureAnnotation(delegate, spock.lang.See), 'See')
     %>
 
     <!-- print given, when, then, ... blocks -->