diff --git a/security-jwt/src/test/groovy/io/micronaut/docs/validator/ExpirationJwtClaimsValidatorSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/docs/validator/ExpirationJwtClaimsValidatorSpec.groovy index 9659745446..9f127437e3 100644 --- a/security-jwt/src/test/groovy/io/micronaut/docs/validator/ExpirationJwtClaimsValidatorSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/docs/validator/ExpirationJwtClaimsValidatorSpec.groovy @@ -13,7 +13,7 @@ class ExpirationJwtClaimsValidatorSpec extends Specification { given: EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [ 'spec.name' : ExpirationJwtClaimsValidatorSpec.simpleName, - ], Environment.TEST) + ]) when: embeddedServer.applicationContext.getBean(ExpirationJwtClaimsValidator) @@ -31,7 +31,7 @@ class ExpirationJwtClaimsValidatorSpec extends Specification { EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [ 'spec.name' : ExpirationJwtClaimsValidatorSpec.simpleName, 'micronaut.security.token.jwt.claims-validators.expiration': false - ], Environment.TEST) + ]) when: embeddedServer.applicationContext.getBean(ExpirationJwtClaimsValidator) diff --git a/security-jwt/src/test/groovy/io/micronaut/docs/validator/SubjectJwtClaimsValidatorSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/docs/validator/SubjectJwtClaimsValidatorSpec.groovy index 1343bcb83d..11ae506dad 100644 --- a/security-jwt/src/test/groovy/io/micronaut/docs/validator/SubjectJwtClaimsValidatorSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/docs/validator/SubjectJwtClaimsValidatorSpec.groovy @@ -14,7 +14,7 @@ class SubjectNotNullJwtClaimsValidatorSpec extends Specification { EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [ 'spec.name' : SubjectNotNullJwtClaimsValidatorSpec.simpleName, - ], Environment.TEST) + ]) when: embeddedServer.applicationContext.getBean(SubjectNotNullJwtClaimsValidator) @@ -33,7 +33,7 @@ class SubjectNotNullJwtClaimsValidatorSpec extends Specification { 'spec.name' : SubjectNotNullJwtClaimsValidatorSpec.simpleName, 'micronaut.security.token.jwt.claims-validators.subject-not-null': false - ], Environment.TEST) + ]) when: embeddedServer.applicationContext.getBean(SubjectNotNullJwtClaimsValidator) diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityDisabledSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityDisabledSpec.groovy index c8590efbdb..cbeac1908b 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityDisabledSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityDisabledSpec.groovy @@ -43,7 +43,7 @@ class SecurityJwtBeansWithSecurityDisabledSpec extends Specification { EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [ 'spec.name' : SecurityJwtBeansWithSecurityDisabledSpec.simpleName, 'micronaut.security.enabled': false, - ], Environment.TEST) + ]) @Unroll("if micronaut.security.enabled=false bean [#description] is not loaded") void "if micronaut.security.enabled=false security related beans are not loaded"(Class clazz, String description) { diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityJwtDisabledSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityJwtDisabledSpec.groovy index 5efea49b87..5a39174986 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityJwtDisabledSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityJwtDisabledSpec.groovy @@ -43,7 +43,7 @@ class SecurityJwtBeansWithSecurityJwtDisabledSpec extends Specification { EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [ 'spec.name' : SecurityJwtBeansWithSecurityJwtDisabledSpec.simpleName, 'micronaut.security.token.jwt.enabled': false, - ], Environment.TEST) + ]) @Unroll("if micronaut.security.enabled=true and micronaut.security.token.jwt.enabled=false bean [#description] is not loaded") void "if micronaut.security.token.jwt.enabled=false security related beans are not loaded"(Class clazz, String description) { diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/encryption/secret/SecretEncryptionSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/encryption/secret/SecretEncryptionSpec.groovy index 10bf4e6776..26bccd6be3 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/encryption/secret/SecretEncryptionSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/encryption/secret/SecretEncryptionSpec.groovy @@ -13,7 +13,7 @@ class SecretEncryptionSpec extends Specification { 'micronaut.security.token.jwt.encryptions.secret.generator.secret': 'XXX', 'micronaut.security.token.jwt.encryptions.secret.generator.jwe-algorithm': 'dir', 'micronaut.security.token.jwt.encryptions.secret.generator.encryption-method': 'A128CBC-HS256', - ], Environment.TEST) + ]) when: ctx.getBean(SecretEncryptionFactory) diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/KeysControllerSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/KeysControllerSpec.groovy index e182ec76e9..ed8349bea8 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/KeysControllerSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/KeysControllerSpec.groovy @@ -28,7 +28,7 @@ class KeysControllerSpec extends Specification { 'spec.name' : 'keyscontrollerspec', 'micronaut.security.endpoints.keys.path': path, - ], Environment.TEST) + ]) HttpClient client = embeddedServer.applicationContext.createBean(HttpClient, embeddedServer.getURL()) when: diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/roles/CustomRolesParserSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/roles/CustomRolesParserSpec.groovy index b89800bbc8..be19e19eb2 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/roles/CustomRolesParserSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/roles/CustomRolesParserSpec.groovy @@ -25,7 +25,7 @@ class CustomRolesParserSpec extends Specification { EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [ 'spec.name': "customclaimsrolesparser", 'micronaut.security.token.jwt.signatures.secret.generator.secret': 'pleaseChangeThisSecretForANewOne', - ], Environment.TEST) + ]) @Shared @AutoCleanup diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwksSignature500Spec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwksSignature500Spec.groovy index 45b6ca15b0..628a707f99 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwksSignature500Spec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwksSignature500Spec.groovy @@ -24,14 +24,13 @@ class JwksSignature500Spec extends Specification implements JwtFixture { @AutoCleanup EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [ (SPEC_NAME_PROPERTY) : 'jwkssignature500spec', - - ], Environment.TEST) + ]) void "if the remote JWKS endpoint throws 500, the JwksSignature handles it and it does not crash"() { given: ApplicationContext context = ApplicationContext.run([ 'micronaut.security.token.jwt.signatures.jwks.awscognito.url': "http://localhost:${embeddedServer.getPort()}/keys", - ], Environment.TEST) + ]) when: Collection beans = context.getBeansOfType(JwksSignature) diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwsSignatureSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwsSignatureSpec.groovy index 6d3a04b815..c467a900df 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwsSignatureSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwsSignatureSpec.groovy @@ -37,13 +37,13 @@ class JwsSignatureSpec extends Specification implements JwtFixture { @AutoCleanup @Shared - EmbeddedServer embeddedServer = embeddedServer = ApplicationContext.run(EmbeddedServer, conf, Environment.TEST) + EmbeddedServer embeddedServer = embeddedServer = ApplicationContext.run(EmbeddedServer, conf) void "JwsSignature does not verify a RSA256 signed JWT, which was generated with a different signature, even if both the JwsSiganture and the JWT support the same algorithm"() { given: ApplicationContext context = ApplicationContext.run([ 'micronaut.security.token.jwt.signatures.jwks.awscognito.url': "http://localhost:${embeddedServer.getPort()}/keys", - ], Environment.TEST) + ]) when: Collection beans = context.getBeansOfType(JwksSignature) diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/rsagenerationvalidation/TwoServicesOneSignWithRsaOneVerfiesWithRsaSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/rsagenerationvalidation/TwoServicesOneSignWithRsaOneVerfiesWithRsaSpec.groovy index 2717dd68d8..8276547e09 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/rsagenerationvalidation/TwoServicesOneSignWithRsaOneVerfiesWithRsaSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/signature/rsagenerationvalidation/TwoServicesOneSignWithRsaOneVerfiesWithRsaSpec.groovy @@ -89,7 +89,7 @@ class TwoServicesOneSignWithRsaOneVerfiesWithRsaSpec extends Specification imple 'micronaut.server.port' : -1, ] - booksEmbeddedServer = ApplicationContext.run(EmbeddedServer, booksConfig, Environment.TEST) + booksEmbeddedServer = ApplicationContext.run(EmbeddedServer, booksConfig) booksPort = booksEmbeddedServer.getPort() BooksRsaSignatureConfiguration booksRsaSignatureConfiguration = new BooksRsaSignatureConfiguration(rsaJwk) booksEmbeddedServer.applicationContext.registerSingleton(RSASignatureConfiguration, booksRsaSignatureConfiguration, Qualifiers.byName("validation")) @@ -126,7 +126,7 @@ class TwoServicesOneSignWithRsaOneVerfiesWithRsaSpec extends Specification imple 'micronaut.security.authentication' : 'bearer', ] - gatewayEmbeddedServer = ApplicationContext.run(EmbeddedServer, gatewayConfig, Environment.TEST) + gatewayEmbeddedServer = ApplicationContext.run(EmbeddedServer, gatewayConfig) GatewayRsaSignatureConfiguration bean = gatewayEmbeddedServer.applicationContext.createBean(GatewayRsaSignatureConfiguration, rsaJwk) gatewayEmbeddedServer.applicationContext.registerSingleton(bean) diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/multitenancy/principal/PrincipalTenantResolverSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/multitenancy/principal/PrincipalTenantResolverSpec.groovy index 1e8692a3d0..2ec8efbf87 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/multitenancy/principal/PrincipalTenantResolverSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/multitenancy/principal/PrincipalTenantResolverSpec.groovy @@ -61,7 +61,7 @@ class PrincipalTenantResolverSpec extends Specification { ] - gormEmbeddedServer = ApplicationContext.run(EmbeddedServer, gormConfig, Environment.TEST) + gormEmbeddedServer = ApplicationContext.run(EmbeddedServer, gormConfig) gormClient = gormEmbeddedServer.applicationContext.createBean(HttpClient, gormEmbeddedServer.getURL()) @@ -95,7 +95,7 @@ class PrincipalTenantResolverSpec extends Specification { 'micronaut.security.token.propagation.service-id-regex': 'books', ] - gatewayEmbeddedServer = ApplicationContext.run(EmbeddedServer, gatewayConfig, Environment.TEST) + gatewayEmbeddedServer = ApplicationContext.run(EmbeddedServer, gatewayConfig) when: for (Class beanClazz : [AuthenticationProviderUserPassword, diff --git a/security-oauth2/src/test/groovy/io/micronaut/security/oauth2/configuration/OauthConfigurationSpec.groovy b/security-oauth2/src/test/groovy/io/micronaut/security/oauth2/configuration/OauthConfigurationSpec.groovy index 95f95572d6..516f6dabf4 100644 --- a/security-oauth2/src/test/groovy/io/micronaut/security/oauth2/configuration/OauthConfigurationSpec.groovy +++ b/security-oauth2/src/test/groovy/io/micronaut/security/oauth2/configuration/OauthConfigurationSpec.groovy @@ -13,7 +13,7 @@ class OauthConfigurationSpec extends Specification { (SPEC_NAME_PROPERTY): getClass().simpleName, 'micronaut.security.oauth2.clients.foo.client-id': 'XXXX', 'micronaut.security.oauth2.clients.foo.client-secret': 'YYYY', - ], Environment.TEST) + ]) when: OauthClientConfiguration clientConfiguration = context.getBean(OauthClientConfiguration) @@ -34,7 +34,7 @@ class OauthConfigurationSpec extends Specification { (SPEC_NAME_PROPERTY): getClass().simpleName, 'micronaut.security.oauth2.clients.foo.client-id': 'XXXX', 'micronaut.security.oauth2.clients.foo.client-secret': 'YYYY', - ], Environment.TEST) + ]) when: context.getBean(OauthClientConfiguration) @@ -61,7 +61,7 @@ class OauthConfigurationSpec extends Specification { 'micronaut.security.oauth2.openid.additional-claims.jwt': true, 'micronaut.security.oauth2.openid.additional-claims.access-token': true, 'micronaut.security.oauth2.openid.additional-claims.refresh-token': true, - ], Environment.TEST) + ]) when: OauthConfiguration config = context.getBean(OauthConfiguration) diff --git a/security/src/test/groovy/io/micronaut/docs/security/securityRule/IpPatternSpec.groovy b/security/src/test/groovy/io/micronaut/docs/security/securityRule/IpPatternSpec.groovy index 0c6e1e5ec1..9e4b2927f0 100644 --- a/security/src/test/groovy/io/micronaut/docs/security/securityRule/IpPatternSpec.groovy +++ b/security/src/test/groovy/io/micronaut/docs/security/securityRule/IpPatternSpec.groovy @@ -39,7 +39,7 @@ micronaut: @Shared @AutoCleanup - EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map, Environment.TEST) + EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map) @Shared @AutoCleanup diff --git a/security/src/test/groovy/io/micronaut/docs/security/securityRule/builtinendpoints/BuiltInEndpointsSpec.groovy b/security/src/test/groovy/io/micronaut/docs/security/securityRule/builtinendpoints/BuiltInEndpointsSpec.groovy index af5f78ed24..414c201ea8 100644 --- a/security/src/test/groovy/io/micronaut/docs/security/securityRule/builtinendpoints/BuiltInEndpointsSpec.groovy +++ b/security/src/test/groovy/io/micronaut/docs/security/securityRule/builtinendpoints/BuiltInEndpointsSpec.groovy @@ -47,7 +47,7 @@ endpoints: @Shared @AutoCleanup - EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map, Environment.TEST) + EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map) @Shared @AutoCleanup diff --git a/security/src/test/groovy/io/micronaut/docs/security/securityRule/intercepturlmap/InterceptUrlMapSpec.groovy b/security/src/test/groovy/io/micronaut/docs/security/securityRule/intercepturlmap/InterceptUrlMapSpec.groovy index b5496349ae..b35026fbeb 100644 --- a/security/src/test/groovy/io/micronaut/docs/security/securityRule/intercepturlmap/InterceptUrlMapSpec.groovy +++ b/security/src/test/groovy/io/micronaut/docs/security/securityRule/intercepturlmap/InterceptUrlMapSpec.groovy @@ -80,7 +80,7 @@ micronaut: @Shared @AutoCleanup - EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map, Environment.TEST) + EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map) @Shared @AutoCleanup diff --git a/security/src/test/groovy/io/micronaut/docs/security/securityRule/permitall/PermitAllSpec.groovy b/security/src/test/groovy/io/micronaut/docs/security/securityRule/permitall/PermitAllSpec.groovy index b2651f7005..25885a1f16 100644 --- a/security/src/test/groovy/io/micronaut/docs/security/securityRule/permitall/PermitAllSpec.groovy +++ b/security/src/test/groovy/io/micronaut/docs/security/securityRule/permitall/PermitAllSpec.groovy @@ -20,7 +20,7 @@ class PermitAllSpec extends Specification { @Shared @AutoCleanup - EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map, Environment.TEST) + EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map) @Shared @AutoCleanup diff --git a/security/src/test/groovy/io/micronaut/docs/security/securityRule/secured/SecuredSpec.groovy b/security/src/test/groovy/io/micronaut/docs/security/securityRule/secured/SecuredSpec.groovy index c1e580f7e8..96236f8964 100644 --- a/security/src/test/groovy/io/micronaut/docs/security/securityRule/secured/SecuredSpec.groovy +++ b/security/src/test/groovy/io/micronaut/docs/security/securityRule/secured/SecuredSpec.groovy @@ -20,7 +20,7 @@ class SecuredSpec extends Specification { @Shared @AutoCleanup - EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map, Environment.TEST) + EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map) @Shared @AutoCleanup diff --git a/security/src/test/groovy/io/micronaut/docs/security/token/basicauth/BasicAuthSpec.groovy b/security/src/test/groovy/io/micronaut/docs/security/token/basicauth/BasicAuthSpec.groovy index 92431fc495..93755e6064 100644 --- a/security/src/test/groovy/io/micronaut/docs/security/token/basicauth/BasicAuthSpec.groovy +++ b/security/src/test/groovy/io/micronaut/docs/security/token/basicauth/BasicAuthSpec.groovy @@ -23,7 +23,7 @@ class BasicAuthSpec extends Specification implements YamlAsciidocTagCleaner { @Shared @AutoCleanup - EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map, Environment.TEST) + EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map) @Shared @AutoCleanup diff --git a/security/src/test/groovy/io/micronaut/docs/security/token/propagation/TokenPropagationSpec.groovy b/security/src/test/groovy/io/micronaut/docs/security/token/propagation/TokenPropagationSpec.groovy index c6e952ebcd..a77e77e97b 100644 --- a/security/src/test/groovy/io/micronaut/docs/security/token/propagation/TokenPropagationSpec.groovy +++ b/security/src/test/groovy/io/micronaut/docs/security/token/propagation/TokenPropagationSpec.groovy @@ -81,8 +81,7 @@ micronaut: @Shared @AutoCleanup EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, - config as Map, - Environment.TEST) + config as Map) @Shared @AutoCleanup diff --git a/security/src/test/groovy/io/micronaut/security/SecurityDisabledSpec.groovy b/security/src/test/groovy/io/micronaut/security/SecurityDisabledSpec.groovy index 7a434bbd86..61432aae7e 100644 --- a/security/src/test/groovy/io/micronaut/security/SecurityDisabledSpec.groovy +++ b/security/src/test/groovy/io/micronaut/security/SecurityDisabledSpec.groovy @@ -39,7 +39,7 @@ class SecurityDisabledSpec extends Specification { EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [ 'spec.name' : SecurityDisabledSpec.simpleName, 'micronaut.security.enabled': false, - ], Environment.TEST) + ]) @Unroll("if micronaut.security.enabled=false bean [#description] is not loaded") void "if micronaut.security.enabled=false security related beans are not loaded"(Class clazz, String description) { diff --git a/security/src/test/groovy/io/micronaut/security/config/SecurityConfigurationPropertiesSpec.groovy b/security/src/test/groovy/io/micronaut/security/config/SecurityConfigurationPropertiesSpec.groovy index 79f5d33daf..70688e6385 100644 --- a/security/src/test/groovy/io/micronaut/security/config/SecurityConfigurationPropertiesSpec.groovy +++ b/security/src/test/groovy/io/micronaut/security/config/SecurityConfigurationPropertiesSpec.groovy @@ -14,7 +14,7 @@ class SecurityConfigurationPropertiesSpec extends Specification { def ctx = ApplicationContext.run([ 'micronaut.security.intercept-url-map': [ [pattern: '/health'] - ]], Environment.TEST) + ]]) when: ctx.getBean(SecurityConfigurationProperties) @@ -32,7 +32,7 @@ class SecurityConfigurationPropertiesSpec extends Specification { def ctx = ApplicationContext.run([ "micronaut.security.intercept-url-map": [ [httpMethod: 'FOO', pattern: '/health', access: ['isAnonymous()']] - ]], Environment.TEST) + ]]) when: ctx.getBean(SecurityConfigurationProperties) @@ -50,7 +50,7 @@ class SecurityConfigurationPropertiesSpec extends Specification { def ctx = ApplicationContext.run([ "micronaut.security.intercept-url-map": [ [httpMethod: 'POST', access: ['isAnonymous()']] - ]], Environment.TEST) + ]]) when: ctx.getBean(SecurityConfigurationProperties) @@ -71,7 +71,7 @@ class SecurityConfigurationPropertiesSpec extends Specification { [pattern: '/health', access: 'isAnonymous()'], [httpMethod: 'POST', pattern: '/health', access: ['isAnonymous()']], [httpMethod: 'post', pattern: '/health', access: ['isAnonymous()']] - ]], Environment.TEST) + ]]) when: SecurityConfigurationProperties config = ctx.getBean(SecurityConfigurationProperties) diff --git a/security/src/test/groovy/io/micronaut/security/endpoints/LogoutControllerAllowedMethodsSpec.groovy b/security/src/test/groovy/io/micronaut/security/endpoints/LogoutControllerAllowedMethodsSpec.groovy index 38b086a2df..fe53c8495d 100644 --- a/security/src/test/groovy/io/micronaut/security/endpoints/LogoutControllerAllowedMethodsSpec.groovy +++ b/security/src/test/groovy/io/micronaut/security/endpoints/LogoutControllerAllowedMethodsSpec.groovy @@ -32,7 +32,7 @@ class LogoutControllerAllowedMethodsSpec extends Specification { void "LogoutController does not accept GET requests by default"() { given: - EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, configuration, Environment.TEST) + EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, configuration) HttpClient client = embeddedServer.applicationContext.createBean(HttpClient, embeddedServer.getURL()) when: @@ -53,7 +53,7 @@ class LogoutControllerAllowedMethodsSpec extends Specification { m.putAll(configuration) m.put('micronaut.security.endpoints.logout.get-allowed', true) - EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, m, Environment.TEST) + EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, m) HttpClient client = embeddedServer.applicationContext.createBean(HttpClient, embeddedServer.getURL()) when: @@ -73,7 +73,7 @@ class LogoutControllerAllowedMethodsSpec extends Specification { m.putAll(configuration) m.put('micronaut.security.endpoints.logout.get-allowed', true) - EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, m, Environment.TEST) + EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, m) HttpClient client = embeddedServer.applicationContext.createBean(HttpClient, embeddedServer.getURL()) when: diff --git a/security/src/test/groovy/io/micronaut/security/propagation/TokenPropagationHttpClientFilterPathSpec.groovy b/security/src/test/groovy/io/micronaut/security/propagation/TokenPropagationHttpClientFilterPathSpec.groovy index 6f0ca5720c..4429a650c3 100644 --- a/security/src/test/groovy/io/micronaut/security/propagation/TokenPropagationHttpClientFilterPathSpec.groovy +++ b/security/src/test/groovy/io/micronaut/security/propagation/TokenPropagationHttpClientFilterPathSpec.groovy @@ -21,7 +21,7 @@ class TokenPropagationHttpClientFilterPathSpec extends Specification { 'micronaut.security.token.writer.header.enabled': true, 'micronaut.security.token.propagation.enabled': true, (SPEC_NAME_PROPERTY):getClass().simpleName - ], Environment.TEST) + ]) when: TokenPropagationHttpClientFilter filter = context.getBean(TokenPropagationHttpClientFilter) @@ -64,7 +64,7 @@ class TokenPropagationHttpClientFilterPathSpec extends Specification { 'micronaut.security.token.propagation.enabled': true, 'micronaut.security.token.propagation.path': '/books/**', (SPEC_NAME_PROPERTY):getClass().simpleName - ], Environment.TEST) + ]) when: TokenPropagationHttpClientFilter filter = context.getBean(TokenPropagationHttpClientFilter)