OD-17991 Fixed test build issues due upgrade Gradle to version 8.12

ishgroup · Jan 2, 2025 · 8361c10 · 8361c10
1 parent a7dfca3
commit 8361c10
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/selenuim-test.yml b/.github/workflows/selenuim-test.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: ankane/setup-mariadb@v1
         with:
           mariadb-version: "10.11"
-          database: angel_selenuim_test
+          database: angel_selenium_test
 
       - uses: actions/checkout@v2
 
@@ -63,7 +63,7 @@ jobs:
 
       - name: Run tests
         if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
-        run: ./gradlew selenium-test:test -x client-html:test -PdbUrl=jdbc:mariadb://localhost:3306/angel_selenuim_test?user=root --stacktrace
+        run: ./gradlew selenium-test:test -x client-html:test -PdbUrl=jdbc:mariadb://localhost:3306/angel_selenium_test?user=root --stacktrace
 
       - name: Publish test results
         uses: EnricoMi/publish-unit-test-result-action@v1

diff --git a/build.gradle b/build.gradle
@@ -131,11 +131,8 @@ subprojects {
 			'Trusted-Library': 'true'
 	}
 
-	ext {
-		testFailed = false
-	}
-
 	test {
+		boolean testFailed = false
 		useJUnitPlatform()
 
 		systemProperties 'java.awt.headless': 'true', 'java.locale.providers': 'COMPAT,SPI'
@@ -158,7 +155,7 @@ subprojects {
 			}
 		}
 		doLast {
-			if (ext.testFailed) {
+			if (testFailed) {
 				throw new Exception("tests failed, exit code == 1")
 			}
 		}

diff --git a/nodeSetup.gradle b/nodeSetup.gradle
@@ -14,7 +14,7 @@ apply plugin: 'com.github.node-gradle.node'
 node {
     version = '20.16.0'
     download = System.properties['os.name'] != "FreeBSD" // FreeBSD has no binaries this plugin can install
-    workDir = file("${project.layout.buildDirectory.get()}/nodejs")
+    workDir = file("${layout.buildDirectory.get()}/nodejs")
     npmInstallCommand = System.getenv("CI") ? 'ci' : 'install'
 }
 

diff --git a/selenium-test/build.gradle b/selenium-test/build.gradle
@@ -72,4 +72,7 @@ test {
     dependsOn "copyConfig"
     dependsOn ":server:startDaemon"
     dependsOn "prepareTestDatabase"
+
+    // ensure tests are always run
+    outputs.upToDateWhen { false }
 }
diff --git a/server/build.gradle b/server/build.gradle
@@ -338,6 +338,7 @@ distZip.dependsOn(copyWebApp, addVersion)
 distZip.finalizedBy(createChecksums)
 
 compileGroovy.mustRunAfter(":api-test:copyConfig")
+compileGroovy.mustRunAfter(":selenium-test:copyConfig")
 compileTestGroovy.dependsOn(copyWebApp)
 
 compileJava {