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

Merge branch '2.4.x' 

Closes gh-24580
This commit is contained in:
Stephane Nicoll 2020-12-21 09:46:34 +01:00
parent c78d0370ec 327ce1b20d
commit f4ce82de40
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
View File

@ -119,7 +119,8 @@ public class SpringBootContextLoader extends AbstractContextLoader {
application.setWebApplicationType(WebApplicationType.NONE);
}
application.setInitializers(initializers);
return application.run(getArgs(config));
String[] args = SpringBootTestArgs.get(config.getContextCustomizers());
return application.run(args);
}
/**
@ -140,19 +141,6 @@ public class SpringBootContextLoader extends AbstractContextLoader {
return new StandardEnvironment();
}
/**
* Return the application arguments to use. If no arguments are available, return an
* empty array.
* @param config the source context configuration
* @return the application arguments to use
* @deprecated since 2.2.7
* @see SpringApplication#run(String...)
*/
@Deprecated
protected String[] getArgs(MergedContextConfiguration config) {
return SpringBootTestArgs.get(config.getContextCustomizers());
}
private void setActiveProfiles(ConfigurableEnvironment environment, String[] profiles) {
environment.setActiveProfiles(profiles);
// Also add as properties to override any application.properties