Skip to content

Pass all command-line 'webtest' and 'webdriver' properties to tests #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-tchad wants to merge 2 commits into
base: develop
Choose a base branch
from
+12 −8
Open

Pass all command-line 'webtest' and 'webdriver' properties to tests #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aebeb5
Pass all command-line 'webtest' and 'webdriver' properties to tests
labkey-tchad Jul 28, 2026
a53ba36
Retain Gradle syntax sugar and add readme clarification
labkey-tchad Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (fix to work off of TeamCity)

### 9.2.0
*Released*: 27 July 2026
(Earliest compatible LabKey version: 26.6.0)
Expand Down
7 changes: 0 additions & 7 deletions src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
}
}
}
}
8 changes: 7 additions & 1 deletion src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.ext.properties.keySet())
{
if (key.startsWith("webtest.") || key.startsWith("webdriver.")) {
systemProperty key, project.ext[key]
}
}
systemProperty "devMode", LabKeyExtension.isDevMode(project)
systemProperty "failure.output.dir", "${BuildUtils.getBuildDirPath(project)}/${LOG_DIR}"
systemProperty "labkey.root", project.rootProject.projectDir
Expand Down