diff --git a/.github/workflows/selenuim-test.yml b/.github/workflows/selenuim-test.yml index 600989c214e..8c97724b08c 100644 --- 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 index 9ee599b8372..e0927f0d13e 100644 --- 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 index c8816fe6e63..11375b06218 100644 --- 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 index 0e2f7bbf205..bd2979bb9b8 100644 --- 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 } } \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 8ec4895efb1..f20b53d6608 100644 --- 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 {