Merge pull request #13852 from codeconsole/7.0.x-isolate-tests

use EnableAutoConfiguration over SpringBootApplication
grails · Nov 21, 2024 · 7c71d9f · 7c71d9f
2 parents c0750cb + 40bc241
commit 7c71d9f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/grails-web-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy b/grails-web-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy
@@ -3,7 +3,7 @@ package grails.boot
 import grails.artefact.Artefact
 import grails.boot.config.GrailsAutoConfiguration
 import grails.web.Controller
-import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory
@@ -31,7 +31,7 @@ class EmbeddedContainerWithGrailsSpec extends Specification {
             new URL("http://localhost:${context.webServer.port}/foos").text == 'all foos'
     }
 
-    @SpringBootApplication
+    @EnableAutoConfiguration
     static class Application extends GrailsAutoConfiguration {
         @Bean
         ConfigurableServletWebServerFactory webServerFactory() {

diff --git a/grails-web-boot/src/test/groovy/grails/boot/GrailsSpringApplicationSpec.groovy b/grails-web-boot/src/test/groovy/grails/boot/GrailsSpringApplicationSpec.groovy
@@ -2,7 +2,7 @@ package grails.boot
 
 import grails.boot.config.GrailsAutoConfiguration
 import org.springframework.boot.SpringApplication
-import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory
@@ -32,7 +32,7 @@ class GrailsSpringApplicationSpec extends Specification{
     }
 
 
-    @SpringBootApplication
+    @EnableAutoConfiguration
     static class Application extends GrailsAutoConfiguration {
         @Bean
         ConfigurableServletWebServerFactory webServerFactory() {