From 60f81c3cc196213e670bb2ef9d1dc54b50033f02 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Thu, 12 Mar 2020 16:23:02 +0100 Subject: [PATCH] Fixed h2 version in tests --- build.gradle | 6 +++--- src/test/resources/application.properties | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 32fec78..d4f0bd4 100644 --- a/build.gradle +++ b/build.gradle @@ -26,8 +26,8 @@ dependencies { implementation 'com.google.code.gson:gson' compile 'io.springfox:springfox-swagger2:2.9.2' compile 'io.springfox:springfox-swagger-ui:2.9.2' - compile "org.springframework.boot:spring-boot-configuration-processor" - + compile 'org.springframework.boot:spring-boot-configuration-processor' + implementation('org.springframework.boot:spring-boot-starter-web') { exclude group: 'org.springframework.boot', module: 'spring-boot-starter-json' } @@ -37,7 +37,7 @@ dependencies { } testImplementation 'org.springframework.security:spring-security-test' - testImplementation 'com.h2database:h2:1.3.148' + testImplementation 'com.h2database:h2:1.4.200' // Fixes https://stackoverflow.com/a/60455550 testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.11' diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 5022558..ce6fe39 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -24,4 +24,12 @@ spring.mail.properties.mail.smtp.connectiontimeout=5000 spring.mail.properties.mail.smtp.timeout=5000 spring.mail.properties.mail.smtp.writetimeout=5000 -server.port = 2000 \ No newline at end of file +server.port = 2000 + +email.registrationSubject=Complete your SmartHut.sm registration +email.registration=To confirm your registration, please click here: +email.registrationPath=http://localhost:8080/register/confirm-account?token= + +email.resetpasswordSubject=SmartHut.sm password reset +email.resetpassword=To reset your password, please click here: +email.resetpasswordPath=http://localhost:3000/password-reset?token= \ No newline at end of file