From 692bcf74b274cc7bd0487d373bf74e76b47ff513 Mon Sep 17 00:00:00 2001
From: Michael Yan <rain@rainboyan.com>
Date: Fri, 5 Apr 2024 23:50:50 +0800
Subject: [PATCH] Update geb skeleton

---
 features/geb/skeleton/build.gradle            | 10 +++-------
 .../resources/GebConfig.groovy                | 20 +++++++++----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/features/geb/skeleton/build.gradle b/features/geb/skeleton/build.gradle
index ef78ed0..644d7b2 100644
--- a/features/geb/skeleton/build.gradle
+++ b/features/geb/skeleton/build.gradle
@@ -7,13 +7,9 @@ webdriverBinaries {
 }
 
 tasks.withType(Test) {
+    useJUnitPlatform()
     systemProperty "geb.env", System.getProperty('geb.env')
     systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
-    if (!System.getenv().containsKey('GITHUB_ACTIONS')) {
-        systemProperty 'webdriver.chrome.driver', System.getProperty('webdriver.chrome.driver')
-        systemProperty 'webdriver.gecko.driver', System.getProperty('webdriver.gecko.driver')
-    } else {
-        systemProperty 'webdriver.chrome.driver', "${System.getenv('CHROMEWEBDRIVER')}/chromedriver"
-        systemProperty 'webdriver.gecko.driver', "${System.getenv('GECKOWEBDRIVER')}/geckodriver"
-    }
+    systemProperty 'webdriver.chrome.driver', System.getProperty('webdriver.chrome.driver')
+    systemProperty 'webdriver.gecko.driver', System.getProperty('webdriver.gecko.driver')
 }
diff --git a/features/geb/skeleton/src/integration-test/resources/GebConfig.groovy b/features/geb/skeleton/src/integration-test/resources/GebConfig.groovy
index d353df2..0d97e35 100644
--- a/features/geb/skeleton/src/integration-test/resources/GebConfig.groovy
+++ b/features/geb/skeleton/src/integration-test/resources/GebConfig.groovy
@@ -10,16 +10,16 @@ environments {
     }
 
     // run via “./gradlew -Dgeb.env=chromeHeadless iT”
-    // chromeHeadless {
-    //     driver = {
-    //         ChromeOptions o = new ChromeOptions()
-    //         o.addArguments('headless')
-    //         new ChromeDriver(o)
-    //     }
-    // }
+    chromeHeadless {
+        driver = {
+            ChromeOptions o = new ChromeOptions()
+            o.addArguments('headless')
+            new ChromeDriver(o)
+        }
+    }
 
     // run via “./gradlew -Dgeb.env=firefox iT”
-    // firefox {
-    //     driver = { new FirefoxDriver() }
-    // }
+    firefox {
+        driver = { new FirefoxDriver() }
+    }
 }