root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x 

Closes gh-22960
This commit is contained in:
Phillip Webb 2020-08-14 15:11:23 -07:00
parent 3e35fd480f 2fe446335a
commit 03d4b89c06
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -7790,7 +7790,7 @@ TIP: If multiple auto-configurations have to be defined, there is no need to ord
Each test can use the runner to represent a particular use case.
For instance, the sample below invokes a user configuration (`UserConfiguration`) and checks that the auto-configuration backs off properly.
Invoking `run` provides a callback context that can be used with `Assert4J`.
Invoking `run` provides a callback context that can be used with `AssertJ`.
[source,java,indent=0]
----