Skip to content

Commit

Permalink
spring-boot: add test profile in addiction testdev/testprod profiles (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
mshima authored Nov 26, 2024
1 parent f6772ac commit 1cda2ef
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ task integrationTest(type: Test) {
events 'FAILED', 'SKIPPED'
exceptionFormat "full"
}
systemProperty('spring.profiles.active', 'testdev')
systemProperty('spring.profiles.active', 'test,testdev')
systemProperty('java.security.egd', 'file:/dev/./urandom')
// uncomment if the tests reports are not generated
// see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ task integrationTest(type: Test) {
events 'FAILED', 'SKIPPED'
exceptionFormat "full"
}
systemProperty('spring.profiles.active', 'testprod')
systemProperty('spring.profiles.active', 'test,testprod')
systemProperty('java.security.egd', 'file:/dev/./urandom')
// uncomment if the tests reports are not generated
// see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
Expand Down
4 changes: 2 additions & 2 deletions generators/spring-boot/templates/pom.xml.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@
<properties>
<!-- default Spring profiles -->
<spring.profiles.active>dev${profile.tls}<%_ if (databaseMigrationLiquibase) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
<profile.test>testdev</profile.test>
<profile.test>test,testdev</profile.test>
</properties>
<dependencies>
<dependency>
Expand All @@ -627,7 +627,7 @@
<properties>
<!-- default Spring profiles -->
<spring.profiles.active>prod${profile.api-docs}${profile.tls}${profile.e2e}<%_ if (databaseMigrationLiquibase) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
<profile.test>testprod</profile.test>
<profile.test>test,testprod</profile.test>
</properties>
<build>
<plugins>
Expand Down

0 comments on commit 1cda2ef

Please sign in to comment.