From 0aebeb50b15ee4c529ec4bd95ab8977b0871b9da Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Tue, 28 Jul 2026 14:03:14 -0700 Subject: [PATCH 1/2] Pass all command-line 'webtest' and 'webdriver' properties to tests --- README.md | 5 +++++ .../groovy/org/labkey/gradle/task/RunTestSuite.groovy | 7 ------- src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy | 8 +++++++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7939fbe3..57e40be0 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,11 @@ on how to do that, including how to develop and test locally and the versioning ## Release Notes +### TBD +*Released*: TBD +(Earliest compatible LabKey version: 26.6.0) +- Pass all command-line 'webtest' and 'webdriver' properties to tests + ### 9.2.0 *Released*: 27 July 2026 (Earliest compatible LabKey version: 26.6.0) diff --git a/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy b/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy index 712ea492..9816165d 100644 --- a/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy +++ b/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy @@ -78,13 +78,6 @@ abstract class RunTestSuite extends RunUiTest systemProperty key, project.teamcity[key] } } - // Include all 'webtest' and 'webdriver' properties, whether they are in test.properties or not - for (String key : project.ext.properties.keySet()) - { - if (key.startsWith("webtest.") || key.startsWith("webdriver.")) { - systemProperty key, project.ext[key] - } - } } } } diff --git a/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy b/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy index 9ae635a5..c8026f49 100644 --- a/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy +++ b/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy @@ -18,7 +18,6 @@ package org.labkey.gradle.task import org.apache.commons.lang3.StringUtils import org.gradle.api.tasks.UntrackedTask import org.gradle.api.tasks.testing.Test -import org.gradle.work.DisableCachingByDefault import org.labkey.gradle.plugin.extension.LabKeyExtension import org.labkey.gradle.plugin.extension.TomcatExtension import org.labkey.gradle.plugin.extension.UiTestExtension @@ -85,6 +84,13 @@ abstract class RunUiTest extends Test if (!StringUtils.isEmpty((String) testConfig.get(key))) systemProperty key, testConfig.get(key) } + // Include all 'webtest' and 'webdriver' properties, whether they are in test.properties or not + for (String key : project.extensions.extraProperties.properties.keySet()) + { + if (key.startsWith("webtest.") || key.startsWith("webdriver.")) { + systemProperty key, project.extensions.extraProperties.get(key) + } + } systemProperty "devMode", LabKeyExtension.isDevMode(project) systemProperty "failure.output.dir", "${BuildUtils.getBuildDirPath(project)}/${LOG_DIR}" systemProperty "labkey.root", project.rootProject.projectDir From a53ba36c5f93c0dbac25f570e74c5a6eb2c7882a Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Tue, 28 Jul 2026 14:18:31 -0700 Subject: [PATCH 2/2] Retain Gradle syntax sugar and add readme clarification --- README.md | 2 +- src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 57e40be0..28739a32 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ on how to do that, including how to develop and test locally and the versioning ### TBD *Released*: TBD (Earliest compatible LabKey version: 26.6.0) -- Pass all command-line 'webtest' and 'webdriver' properties to tests +- Pass all command-line 'webtest' and 'webdriver' properties to tests (fix to work off of TeamCity) ### 9.2.0 *Released*: 27 July 2026 diff --git a/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy b/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy index c8026f49..219692bd 100644 --- a/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy +++ b/src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy @@ -85,10 +85,10 @@ abstract class RunUiTest extends Test systemProperty key, testConfig.get(key) } // Include all 'webtest' and 'webdriver' properties, whether they are in test.properties or not - for (String key : project.extensions.extraProperties.properties.keySet()) + for (String key : project.ext.properties.keySet()) { if (key.startsWith("webtest.") || key.startsWith("webdriver.")) { - systemProperty key, project.extensions.extraProperties.get(key) + systemProperty key, project.ext[key] } } systemProperty "devMode", LabKeyExtension.isDevMode(project)