From 6a6e2b4b3135834c9ea48a9d0ddb403a4ba490a0 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Wed, 21 Aug 2024 17:41:40 +0200 Subject: [PATCH 1/2] fix(deps): Update to `grails-testing-support:4.0.0-SNAPSHOT` --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index fa78381408..e7340aecdb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,8 +43,8 @@ spockVersion=2.3-groovy-4.0 springBootVersion=3.2.6 springLoadedVersion=1.2.8.RELEASE springVersion=6.1.8 -testingSupportVersion=3.2.1 -testingSupportVersionForTests=3.2.2 +testingSupportVersion=4.0.0-SNAPSHOT +testingSupportVersionForTests=4.0.0-SNAPSHOT tomcatLog4jVersion=8.5.2 tomcatVersion=10.1.25 viewsVersion=3.2.3 From 2a9f0500aaea8d24cee2b5ed57771c6296f8cac1 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 22 Aug 2024 08:33:47 +0200 Subject: [PATCH 2/2] test(enable): `grails-gsp` now on `jakarta.servlet` This commit enables the tests that were disabled before `grails-gsp` was migrated to `jakarta.servlet`. See #13545 --- .../mixin/AstEnhancedControllerUnitTestMixinTests.groovy | 2 -- .../test/mixin/AutowireServiceViaDefineBeansTests.groovy | 2 -- .../test/mixin/ControllerAndGroovyPageMixinTests.groovy | 2 -- .../ControllerMockWithMultipleControllersSpec.groovy | 2 -- .../grails/test/mixin/ControllerTestForTests.groovy | 2 -- .../test/mixin/ControllerUnitTestMixinTests.groovy | 2 -- .../test/mixin/ControllerWithMockCollabTests.groovy | 3 --- .../mixin/DomainClassControllerUnitTestMixinTests.groovy | 2 -- .../test/mixin/GroovyPageUnitTestMixinTests.groovy | 2 -- .../GroovyPageUnitTestMixinWithCustomViewDirSpec.groovy | 3 --- .../test/mixin/InterceptorUnitTestMixinSpec.groovy | 2 -- .../mixin/ResourceAnnotationRestfulControllerSpec.groovy | 2 -- .../grails/test/mixin/RestfulControllerSpec.groovy | 2 -- .../test/mixin/RestfulControllerSubclassSpec.groovy | 2 -- .../test/mixin/RestfulControllerSuperClassSpec.groovy | 6 ++---- .../grails/test/mixin/SetupTeardownInvokeTests.groovy | 6 ++---- .../grails/test/mixin/TagLibraryInvokeBodySpec.groovy | 2 -- .../mixin/TestForControllerWithoutMockDomainTests.groovy | 2 -- .../test/mixin/UnitTestDataBindingAssociatonTests.groovy | 4 ---- .../grails/test/mixin/UrlMappingsTestMixinTests.groovy | 9 --------- .../org/grails/web/metaclass/ChainMethodTests.groovy | 2 -- .../ChainMethodWithRequestDataValueProcessorSpec.groovy | 4 ---- .../org/grails/web/metaclass/ForwardMethodTests.groovy | 2 -- .../servlet/MultipleRenderCallsContentTypeTests.groovy | 2 -- .../org/grails/web/servlet/RenderMethodTests.groovy | 6 ++---- .../web/servlet/mvc/ControllerInheritanceTests.groovy | 2 -- .../grails/web/servlet/mvc/PermanentRedirectSpec.groovy | 2 -- .../grails/web/servlet/mvc/RedirectMethodTests.groovy | 4 ---- ...edirectMethodWithRequestDataValueProcessorSpec.groovy | 2 -- .../web/servlet/mvc/RedirectToDefaultActionTests.groovy | 2 -- .../web/servlet/mvc/RenderDynamicMethodTests.groovy | 2 -- .../web/servlet/mvc/TagLibDynamicMethodsTests.groovy | 2 -- .../test/groovy/grails/rest/web/RespondMethodSpec.groovy | 7 ++----- .../grails/test/mixin/TagLibWithServiceMockTests.groovy | 2 -- .../mixin/TestForControllerWithNamePropertySpec.groovy | 2 -- .../grails/test/mixin/UrlMappingsTestForTests.groovy | 2 -- .../src/test/groovy/grails/test/web/FordedUrlSpec.groovy | 2 -- .../grails/test/web/GetHeadersFromResponseSpec.groovy | 2 -- .../groovy/grails/test/web/RedirectToDomainSpec.groovy | 2 -- .../ControllerActionTransformerAllowedMethodsSpec.groovy | 2 -- .../groovy/org/grails/compiler/web/WithFormatSpec.groovy | 2 -- .../web/converters/ConvertersControllersApiSpec.groovy | 2 -- .../org/grails/web/binding/BindCommandObjectsSpec.groovy | 2 -- .../web/binding/BindStringArrayToGenericListTests.groovy | 2 -- .../groovy/org/grails/web/binding/BindToEnumTests.groovy | 3 --- .../web/binding/BindToObjectWithEmbeddableTests.groovy | 2 -- .../web/binding/BindXmlWithAssociationTests.groovy | 2 -- .../org/grails/web/binding/BindingExcludeTests.groovy | 2 -- .../grails/web/binding/BindingRequestMethodSpec.groovy | 2 -- .../org/grails/web/binding/BindingToNullableTests.groovy | 2 -- .../org/grails/web/binding/CheckboxBindingTests.groovy | 2 -- .../binding/ControllerActionParameterBindingSpec.groovy | 2 -- .../org/grails/web/binding/DataBindingTests.groovy | 2 -- .../org/grails/web/binding/EnumBindingTests.groovy | 2 -- .../web/binding/GrailsParameterMapBindingSpec.groovy | 2 -- .../org/grails/web/binding/JSONBindingToNullTests.groovy | 2 -- .../binding/JSONRequestToResponseRenderingSpec.groovy | 2 -- .../org/grails/web/binding/NestedXmlBindingTests.groovy | 2 -- .../web/binding/hal/json/HalJsonBindingSpec.groovy | 2 -- .../grails/web/binding/hal/xml/HalXmlBindingSpec.groovy | 2 -- .../org/grails/web/binding/json/JsonBindingSpec.groovy | 2 -- .../json/JsonBindingWithExceptionHandlerSpec.groovy | 2 -- .../org/grails/web/binding/xml/XmlBindingSpec.groovy | 2 -- .../test/groovy/org/grails/web/codecs/CodecSpec.groovy | 2 -- .../commandobjects/CommandObjectInstantiationSpec.groovy | 2 -- .../web/commandobjects/CommandObjectNoDataSpec.groovy | 2 -- .../commandobjects/CommandObjectNullabilitySpec.groovy | 2 -- .../grails/web/commandobjects/CommandObjectsSpec.groovy | 2 -- .../grails/web/controllers/ContentNegotiationSpec.groovy | 2 -- .../ControllerExceptionHandlerInheritanceSpec.groovy | 2 -- .../controllers/ControllerExceptionHandlerSpec.groovy | 2 -- .../web/controllers/ControllerMetaProgrammingSpec.groovy | 2 -- .../converters/ControllerWithXmlConvertersTests.groovy | 2 -- .../web/converters/ConverterConfigurationTests.groovy | 4 ---- .../org/grails/web/converters/JSONConverterTests.groovy | 2 -- .../grails/web/converters/MarshallerRegistrarSpec.groovy | 2 -- .../org/grails/web/includes/IncludeHandlingSpec.groovy | 2 -- .../web/json/DomainClassCollectionRenderingSpec.groovy | 2 -- .../web/mapping/AdditionalParamsMappingTests.groovy | 3 --- .../web/mapping/DoubleWildcardUrlMappingTests.groovy | 3 --- .../web/mapping/DynamicActionNameEvaluatingTests.groovy | 2 -- .../web/mapping/DynamicParameterValuesTests.groovy | 3 --- .../org/grails/web/mapping/IdUrlMappingTests.groovy | 2 -- .../grails/web/mapping/OverlappingUrlMappingTests.groovy | 5 ----- .../org/grails/web/mapping/RegexUrlMappingTests.groovy | 5 ----- .../web/mapping/ResponseCodeUrlMappingTests.groovy | 2 -- .../org/grails/web/mapping/RestfulMappingTests.groovy | 2 -- .../grails/web/mapping/UrlMappingEvaluatorTests.groovy | 2 -- .../grails/web/mapping/UrlMappingParameterTests.groovy | 3 --- .../groovy/org/grails/web/mapping/UrlMappingTests.groovy | 3 --- .../mapping/UrlMappingWithCustomValidatorTests.groovy | 3 --- .../org/grails/web/mapping/UrlMappingsHolderTests.groovy | 2 -- .../org/grails/web/mapping/ViewUrlMappingTests.groovy | 4 ---- .../web/metaclass/CollectionBindDataMethodSpec.groovy | 2 -- .../grails/web/mime/ContentFormatControllerTests.groovy | 2 -- .../org/grails/web/mime/WithFormatContentTypeSpec.groovy | 2 -- .../org/grails/web/servlet/BindDataMethodTests.groovy | 4 +--- 97 files changed, 9 insertions(+), 236 deletions(-) diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy index 91e76f7cb6..63b3be90fd 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy @@ -3,13 +3,11 @@ package grails.test.mixin import grails.testing.web.controllers.ControllerUnitTest import org.grails.plugins.testing.GrailsMockMultipartFile import org.grails.web.servlet.mvc.SynchronizerTokensHolder -import spock.lang.Ignore import spock.lang.Specification /** * @author Graeme Rocher */ -@Ignore('grails-gsp is not on jakarta.servlet yet') class AstEnhancedControllerUnitTestMixinTests extends Specification implements ControllerUnitTest { void setup() { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AutowireServiceViaDefineBeansTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AutowireServiceViaDefineBeansTests.groovy index 844ddd82cb..2f2bfd21fd 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AutowireServiceViaDefineBeansTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AutowireServiceViaDefineBeansTests.groovy @@ -4,13 +4,11 @@ import grails.artefact.Artefact import grails.testing.web.controllers.ControllerUnitTest; import org.springframework.context.ApplicationContext import org.springframework.context.ApplicationContextAware -import spock.lang.Ignore import spock.lang.Specification /** * Tests that services can be autowired into controllers via defineBeans */ -@Ignore('grails-gsp is not on jakarta.servlet yet') class AutowireServiceViaDefineBeansTests extends Specification implements ControllerUnitTest { void testThatBeansAreWired() { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy index 7a884dac03..c960836871 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy @@ -2,13 +2,11 @@ package grails.test.mixin import grails.artefact.Artefact import grails.testing.web.controllers.ControllerUnitTest -import spock.lang.Ignore import spock.lang.Specification /** * @author Graeme Rocher */ -@Ignore('grails-gsp is not on jakarta.servlet yet') class ControllerAndGroovyPageMixinTests extends Specification implements ControllerUnitTest { // GRAILS-9718 diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerMockWithMultipleControllersSpec.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerMockWithMultipleControllersSpec.groovy index 9f523178b9..a891b1cd89 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerMockWithMultipleControllersSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerMockWithMultipleControllersSpec.groovy @@ -1,10 +1,8 @@ package grails.test.mixin import grails.testing.web.GrailsWebUnitTest -import spock.lang.Ignore import spock.lang.Specification -@Ignore('grails-gsp is not on jakarta.servlet yet') class ControllerMockWithMultipleControllersSpec extends Specification implements GrailsWebUnitTest { void "Test that both mocked controllers are valid"() { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerTestForTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerTestForTests.groovy index 301531b734..7b2d68ce4b 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerTestForTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerTestForTests.groovy @@ -5,10 +5,8 @@ import grails.persistence.Entity import grails.testing.gorm.DomainUnitTest import grails.testing.web.controllers.ControllerUnitTest import org.springframework.web.servlet.support.RequestContextUtils -import spock.lang.Ignore import spock.lang.Specification -@Ignore('grails-gsp is not on jakarta.servlet yet') class ControllerTestForTests extends Specification implements ControllerUnitTest, DomainUnitTest { void testIndex() { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy index 68a9757a14..0e12ddf9b6 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy @@ -12,7 +12,6 @@ import org.grails.web.servlet.mvc.SynchronizerTokensHolder import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.MessageSource import org.springframework.web.multipart.MultipartFile -import spock.lang.Ignore import spock.lang.Specification import jakarta.servlet.http.HttpServletResponse @@ -22,7 +21,6 @@ import jakarta.servlet.http.HttpServletResponse * * @author Graeme Rocher */ -@Ignore('grails-gsp is not on jakarta.servlet yet') class ControllerUnitTestMixinTests extends Specification implements ControllerUnitTest { void testRenderText() { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy index a6e53bfc71..7eaa1b008f 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy @@ -2,14 +2,11 @@ package grails.test.mixin import grails.artefact.Artefact import grails.testing.web.controllers.ControllerUnitTest -import org.junit.Test -import spock.lang.Ignore import spock.lang.Specification /** * Tests a controller with a mock collaborator */ -@Ignore('grails-gsp is not on jakarta.servlet yet') class ControllerWithMockCollabTests extends Specification implements ControllerUnitTest { void testFirstCall() { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy index 81cdd25451..c25d9033bc 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy @@ -5,13 +5,11 @@ import grails.converters.XML import grails.persistence.Entity import grails.testing.gorm.DataTest import grails.testing.web.controllers.ControllerUnitTest -import spock.lang.Ignore import spock.lang.Specification /** * A Junit 4 test that tests a scaffolded controllers logic using the new mixins */ -@Ignore('grails-gsp is not on jakarta.servlet yet') class DomainClassControllerUnitTestMixinTests extends Specification implements ControllerUnitTest, DataTest { void setupSpec() { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinTests.groovy index f3bbd25f65..2edc99dbf8 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinTests.groovy @@ -2,14 +2,12 @@ package grails.test.mixin import grails.artefact.Artefact import grails.testing.web.GrailsWebUnitTest -import spock.lang.Ignore import spock.lang.Issue import spock.lang.Specification /** * @author Graeme Rocher */ -@Ignore('grails-gsp is not on jakarta.servlet yet') class GroovyPageUnitTestMixinTests extends Specification implements GrailsWebUnitTest { void setupSpec() { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinWithCustomViewDirSpec.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinWithCustomViewDirSpec.groovy index 1bee02630d..36adbda64b 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinWithCustomViewDirSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinWithCustomViewDirSpec.groovy @@ -1,12 +1,9 @@ package grails.test.mixin import grails.testing.web.GrailsWebUnitTest -import spock.lang.Ignore import spock.lang.Issue import spock.lang.Specification - -@Ignore('grails-gsp is not on jakarta.servlet yet') class GroovyPageUnitTestMixinWithCustomViewDirSpec extends Specification implements GrailsWebUnitTest { Closure doWithConfig() {{ c -> diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/InterceptorUnitTestMixinSpec.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/InterceptorUnitTestMixinSpec.groovy index 5bf5d0795f..a12e43c76f 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/InterceptorUnitTestMixinSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/InterceptorUnitTestMixinSpec.groovy @@ -2,13 +2,11 @@ package grails.test.mixin import grails.artefact.Interceptor import grails.testing.web.interceptor.InterceptorUnitTest -import spock.lang.Ignore import spock.lang.Specification /** * Created by graemerocher on 02/09/15. */ -@Ignore('grails-gsp is not on jakarta.servlet yet') class InterceptorUnitTestMixinSpec extends Specification implements InterceptorUnitTest { void "Test interceptor matching"() { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ResourceAnnotationRestfulControllerSpec.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ResourceAnnotationRestfulControllerSpec.groovy index 196e6ea6c0..fcbe3d1aa2 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ResourceAnnotationRestfulControllerSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ResourceAnnotationRestfulControllerSpec.groovy @@ -9,14 +9,12 @@ import grails.web.api.WebAttributes import grails.web.databinding.DataBinder import org.codehaus.groovy.control.CompilerConfiguration -import spock.lang.Ignore import spock.lang.Shared import spock.lang.Specification /** * @author Graeme Rocher */ //TODO: Replace ControllerUnitTest with ControllerUnitTest once update to Groovy 3.0.7 -@Ignore('grails-gsp is not on jakarta.servlet yet') class ResourceAnnotationRestfulControllerSpec extends Specification implements DataTest, ControllerUnitTest { @Shared Class domainClass diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSpec.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSpec.groovy index 5cf1426828..22e10e9610 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSpec.groovy @@ -3,7 +3,6 @@ package grails.test.mixin import grails.gorm.transactions.Transactional import grails.testing.gorm.DomainUnitTest import grails.testing.web.controllers.ControllerUnitTest -import spock.lang.Ignore import static org.springframework.http.HttpStatus.* import grails.artefact.Artefact @@ -13,7 +12,6 @@ import spock.lang.Specification /** * @video Graeme Rocher */ -@Ignore('grails-gsp is not on jakarta.servlet yet') class RestfulControllerSpec extends Specification implements ControllerUnitTest, DomainUnitTest