Merge branch '2.4.x'

pull/26690/head
Phillip Webb 4 years ago
commit 42865daca9

@ -719,12 +719,6 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests {
"Config data location 'file:src/test/resources/config/0-empty/*/' contains no subdirectories"); "Config data location 'file:src/test/resources/config/0-empty/*/' contains no subdirectories");
} }
@Test
void runWhenOptionalWildcardLocationHasNoSubdirectories() {
assertThatNoException().isThrownBy(() -> this.application
.run("--spring.config.location=optional:file:src/test/resources/config/0-empty/*/"));
}
@Test @Test
void runWhenHasMandatoryWildcardLocationThatDoesNotExist() { void runWhenHasMandatoryWildcardLocationThatDoesNotExist() {
assertThatExceptionOfType(ConfigDataLocationNotFoundException.class) assertThatExceptionOfType(ConfigDataLocationNotFoundException.class)

Loading…
Cancel
Save