You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/07/08 13:43:42 UTC
(grails-core) branch 7.0.x updated: Test flakiness - switch from dumbster to greenmail
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 4a8769ebd4 Test flakiness - switch from dumbster to greenmail
4a8769ebd4 is described below
commit 4a8769ebd41a71c5e61e205b3791b7e92628e549
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Jul 8 09:42:34 2026 -0400
Test flakiness - switch from dumbster to greenmail
---
gradle.properties | 2 -
.../spring-security/ui/extended/build.gradle | 1 -
.../spring-security/ui/simple/build.gradle | 2 +-
.../groovy/simple/spec/RegisterSpec.groovy | 52 ++++++++--------------
4 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 5247fb4a1a..55d5277180 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,8 +29,6 @@ apacheMavenResolverVersion=1.9.22
commonsValidatorVersion=1.9.0
concurrentlinkedhashmapLruVersion=1.4.2
defaultElImplementationVersion=5.0.0
-# TODO: dumbster should be switched to greenmail / maintained plugin
-dumbsterVersion=1.6
# See https://projects.eclipse.org/releases/jakarta-10 and latest 5.0.x from https://mvnrepository.com/artifact/jakarta.el/jakarta.el-api
elApiVersion=5.0.1
expectitCoreVersion=0.9.0
diff --git a/grails-test-examples/spring-security/ui/extended/build.gradle b/grails-test-examples/spring-security/ui/extended/build.gradle
index 9cfa3377b2..23de3fbf75 100644
--- a/grails-test-examples/spring-security/ui/extended/build.gradle
+++ b/grails-test-examples/spring-security/ui/extended/build.gradle
@@ -40,7 +40,6 @@ dependencies {
implementation 'org.apache.grails:grails-rest-transforms' // Needed for respond method in controllers
implementation 'org.apache.grails:grails-data-hibernate5'
- implementation "dumbster:dumbster:$dumbsterVersion", { transitive = false } // Uses javax
implementation 'org.apache.grails:grails-mail'
compileOnly 'org.slf4j:slf4j-nop' // Remove warning about missing slf4j implementation during gsp compilation
diff --git a/grails-test-examples/spring-security/ui/simple/build.gradle b/grails-test-examples/spring-security/ui/simple/build.gradle
index 8ee64826d7..6b1bf070ff 100644
--- a/grails-test-examples/spring-security/ui/simple/build.gradle
+++ b/grails-test-examples/spring-security/ui/simple/build.gradle
@@ -40,7 +40,6 @@ dependencies {
implementation 'org.apache.grails:grails-databinding'
implementation 'org.apache.grails:grails-data-hibernate5'
- implementation "dumbster:dumbster:$dumbsterVersion", { transitive = false } // Uses javax
implementation 'org.apache.grails:grails-mail'
compileOnly 'org.slf4j:slf4j-nop' // Remove warning about missing slf4j implementation during gsp compilation
@@ -55,6 +54,7 @@ dependencies {
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
+ integrationTestImplementation "com.icegreen:greenmail:$greenmailVersion"
integrationTestImplementation testFixtures(project(':grails-test-examples-spring-security-ui-common'))
integrationTestImplementation testFixtures('org.apache.grails:grails-geb')
}
diff --git a/grails-test-examples/spring-security/ui/simple/src/integration-test/groovy/simple/spec/RegisterSpec.groovy b/grails-test-examples/spring-security/ui/simple/src/integration-test/groovy/simple/spec/RegisterSpec.groovy
index e35174563d..3c289967ce 100644
--- a/grails-test-examples/spring-security/ui/simple/src/integration-test/groovy/simple/spec/RegisterSpec.groovy
+++ b/grails-test-examples/spring-security/ui/simple/src/integration-test/groovy/simple/spec/RegisterSpec.groovy
@@ -18,8 +18,10 @@
*/
package simple.spec
-import com.dumbster.smtp.SimpleSmtpServer
-import com.dumbster.smtp.SmtpMessage
+import com.icegreen.greenmail.util.GreenMail
+import com.icegreen.greenmail.util.GreenMailUtil
+import com.icegreen.greenmail.util.ServerSetup
+import jakarta.mail.internet.MimeMessage
import page.HomePage
import page.register.ForgotPasswordPage
import page.register.RegisterPage
@@ -113,20 +115,18 @@ class RegisterSpec extends SecurityUISpec {
then:
pageSource.contains('Your account registration email was sent - check your mail!')
- smtpServer.receivedEmailSize == 1
+ smtpServer.waitForIncomingEmail(1)
when:
def smtpMessage = fetchCurrentEmail(smtpServer)
then:
- with(smtpMessage) {
- getHeaderValue('Subject') == 'New Account'
- body.contains("Hi $un")
- }
+ smtpMessage.subject == 'New Account'
+ GreenMailUtil.getBody(smtpMessage).contains("Hi $un")
when:
def verificationCodePattern = ~/^[a-f0-9]{32}$/
- def code = findCode(smtpMessage.body, 'verifyRegistration')
+ def code = findCode(GreenMailUtil.getBody(smtpMessage), 'verifyRegistration')
then:
code ==~ verificationCodePattern
@@ -150,19 +150,17 @@ class RegisterSpec extends SecurityUISpec {
then:
pageSource.contains('Your password reset email was sent - check your mail!')
- smtpServer.receivedEmailSize == 2
+ smtpServer.waitForIncomingEmail(2)
when:
smtpMessage = fetchCurrentEmail(smtpServer)
then:
- smtpMessage.with {
- getHeaderValue('Subject') == 'Password Reset'
- body.contains("Hi $un")
- }
+ smtpMessage.subject == 'Password Reset'
+ GreenMailUtil.getBody(smtpMessage).contains("Hi $un")
when:
- code = findCode(smtpMessage.body, 'resetPassword')
+ code = findCode(GreenMailUtil.getBody(smtpMessage), 'resetPassword')
via(ResetPasswordPage, '123')
then:
@@ -243,13 +241,8 @@ class RegisterSpec extends SecurityUISpec {
smtpServer.stop()
}
- private static SmtpMessage fetchCurrentEmail(SimpleSmtpServer smtpServer) {
- def received = smtpServer.receivedEmail
- def email = null
- while (received.hasNext()) {
- email = received.next()
- }
- return email as SmtpMessage
+ private static MimeMessage fetchCurrentEmail(GreenMail smtpServer) {
+ smtpServer.receivedMessages.last()
}
private static String findCode(String body, String action) {
@@ -259,19 +252,10 @@ class RegisterSpec extends SecurityUISpec {
matcher.group(1)
}
- private SimpleSmtpServer startSmtpServer() {
- int port = 1025
- while (true) {
- try {
- new ServerSocket(port).close()
- break
- }
- catch (IOException ignored) {
- port++
- assert port < 2000, 'cannot find open port'
- }
- }
- def smtpServer = SimpleSmtpServer.start(port)
+ private GreenMail startSmtpServer() {
+ def smtpServer = new GreenMail(ServerSetup.SMTP.dynamicPort())
+ smtpServer.start()
+ int port = smtpServer.smtp.port
go("testData/updateMailSenderPort?port=$port")
assert pageSource.contains("OK: $port")
smtpServer