Skip to content

Commit af07358

Browse files
committed
Merge branch '3.4.x' into 3.5.x
Closes gh-47775
2 parents 6683d0f + b0bef35 commit af07358

File tree

1 file changed

+42
-0
lines changed

1 file changed

+42
-0
lines changed

spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,24 @@
66
"description": "Type of existing DataSource to replace.",
77
"defaultValue": "any"
88
},
9+
{
10+
"name": "spring.test.jsontesters.enabled",
11+
"type": "java.lang.Boolean",
12+
"description": "Whether auto-configuration of JSON testers is enabled.",
13+
"defaultValue": "true"
14+
},
15+
{
16+
"name": "spring.test.mockmvc.webclient.enabled",
17+
"type": "java.lang.Boolean",
18+
"description": "Whether HTMLUnit's WebClient should be auto-configured when it's on the classpath.",
19+
"defaultValue": true
20+
},
21+
{
22+
"name": "spring.test.mockmvc.webdriver.enabled",
23+
"type": "java.lang.Boolean",
24+
"description": "Whether Selenium's WebDriver should be auto-configured when it's on the classpath.",
25+
"defaultValue": true
26+
},
927
{
1028
"name": "spring.test.observability.auto-configure",
1129
"type": "java.lang.Boolean",
@@ -18,6 +36,30 @@
1836
"description": "Whether the condition evaluation report should be printed when the ApplicationContext fails to start.",
1937
"defaultValue": true
2038
},
39+
{
40+
"name": "spring.test.webclient.mockrestserviceserver.enabled",
41+
"type": "java.lang.Boolean",
42+
"description": "Whether a MockRestServiceServer should be auto-configured.",
43+
"defaultValue": true
44+
},
45+
{
46+
"name": "spring.test.webclient.register-rest-template",
47+
"type": "java.lang.Boolean",
48+
"description": "Whether a RestTemplate bean should be registered.",
49+
"defaultValue": false
50+
},
51+
{
52+
"name": "spring.test.webservice.client.mockserver.enabled",
53+
"type": "java.lang.Boolean",
54+
"description": "Whether a MockWebServiceServer should be auto-configured.",
55+
"defaultValue": true
56+
},
57+
{
58+
"name": "spring.test.webservice.client.register-web-service-template",
59+
"type": "java.lang.Boolean",
60+
"description": "Whether a WebServiceTemplate bean should be registered.",
61+
"defaultValue": false
62+
},
2163
{
2264
"name": "spring.test.webtestclient.timeout",
2365
"type": "java.time.Duration",

0 commit comments

Comments
 (0)