Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: don't specify test environment #842

Merged
merged 1 commit into from
Nov 9, 2021
Merged

test: don't specify test environment #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...y-jwt/src/test/groovy/io/micronaut/docs/validator/ExpirationJwtClaimsValidatorSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ...rity-jwt/src/test/groovy/io/micronaut/docs/validator/SubjectJwtClaimsValidatorSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class SubjectNotNullJwtClaimsValidatorSpec extends Specification {
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [
'spec.name' : SubjectNotNullJwtClaimsValidatorSpec.simpleName,

], Environment.TEST)
])

when:
embeddedServer.applicationContext.getBean(SubjectNotNullJwtClaimsValidator)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...st/groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityDisabledSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...groovy/io/micronaut/security/token/jwt/SecurityJwtBeansWithSecurityJwtDisabledSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...test/groovy/io/micronaut/security/token/jwt/encryption/secret/SecretEncryptionSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...y-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/KeysControllerSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...ty-jwt/src/test/groovy/io/micronaut/security/token/jwt/roles/CustomRolesParserSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...rc/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwksSignature500Spec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<JwksSignature> beans = context.getBeansOfType(JwksSignature)
Expand Down
4 changes: 2 additions & 2 deletions ...wt/src/test/groovy/io/micronaut/security/token/jwt/signature/jwks/JwsSignatureSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<JwksSignature> beans = context.getBeansOfType(JwksSignature)
Expand Down
4 changes: 2 additions & 2 deletions ...t/signature/rsagenerationvalidation/TwoServicesOneSignWithRsaOneVerfiesWithRsaSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions ...ovy/io/micronaut/security/token/multitenancy/principal/PrincipalTenantResolverSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())

Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions .../src/test/groovy/io/micronaut/security/oauth2/configuration/OauthConfigurationSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion security/src/test/groovy/io/micronaut/docs/security/securityRule/IpPatternSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ micronaut:

@Shared
@AutoCleanup
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>, Environment.TEST)
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>)

@Shared
@AutoCleanup
Expand Down
2 changes: 1 addition & 1 deletion ...oovy/io/micronaut/docs/security/securityRule/builtinendpoints/BuiltInEndpointsSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ endpoints:

@Shared
@AutoCleanup
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>, Environment.TEST)
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>)

@Shared
@AutoCleanup
Expand Down
2 changes: 1 addition & 1 deletion ...groovy/io/micronaut/docs/security/securityRule/intercepturlmap/InterceptUrlMapSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ micronaut:

@Shared
@AutoCleanup
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>, Environment.TEST)
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>)

@Shared
@AutoCleanup
Expand Down
2 changes: 1 addition & 1 deletion ...ty/src/test/groovy/io/micronaut/docs/security/securityRule/permitall/PermitAllSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class PermitAllSpec extends Specification {

@Shared
@AutoCleanup
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>, Environment.TEST)
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>)

@Shared
@AutoCleanup
Expand Down
2 changes: 1 addition & 1 deletion security/src/test/groovy/io/micronaut/docs/security/securityRule/secured/SecuredSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SecuredSpec extends Specification {

@Shared
@AutoCleanup
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>, Environment.TEST)
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>)

@Shared
@AutoCleanup
Expand Down
2 changes: 1 addition & 1 deletion security/src/test/groovy/io/micronaut/docs/security/token/basicauth/BasicAuthSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class BasicAuthSpec extends Specification implements YamlAsciidocTagCleaner {

@Shared
@AutoCleanup
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>, Environment.TEST)
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, config as Map<String, Object>)

@Shared
@AutoCleanup
Expand Down
3 changes: 1 addition & 2 deletions .../src/test/groovy/io/micronaut/docs/security/token/propagation/TokenPropagationSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ micronaut:
@Shared
@AutoCleanup
EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer,
config as Map<String, Object>,
Environment.TEST)
config as Map<String, Object>)

@Shared
@AutoCleanup
Expand Down
2 changes: 1 addition & 1 deletion security/src/test/groovy/io/micronaut/security/SecurityDisabledSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions ...y/src/test/groovy/io/micronaut/security/config/SecurityConfigurationPropertiesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions ...src/test/groovy/io/micronaut/security/endpoints/LogoutControllerAllowedMethodsSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .../groovy/io/micronaut/security/propagation/TokenPropagationHttpClientFilterPathSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down