From 4f048272eb340b8bf9c7c4b9a24dfd743829cead Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Apr 2025 19:48:57 +0000 Subject: [PATCH 1/3] Bump org.springframework.boot:spring-boot-starter-parent Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.3.10 to 3.4.5. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.10...v3.4.5) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-version: 3.4.5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4538e4d9..d18f1878 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.10 + 3.4.5 From b8bb1085b001e6e33b059e671062d51b86690ed6 Mon Sep 17 00:00:00 2001 From: Mathias Langlet Date: Fri, 16 May 2025 14:28:18 +0200 Subject: [PATCH 2/3] Use htmlunit3-driver instead of htmlunit-driver --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d18f1878..87d827e8 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ org.seleniumhq.selenium - htmlunit-driver + htmlunit3-driver test From a919cacffa9de4267a3c3daabaadf5d897e7b539 Mon Sep 17 00:00:00 2001 From: Mathias Langlet Date: Fri, 16 May 2025 14:34:36 +0200 Subject: [PATCH 3/3] Replace @DirtiesContext with @Transactional on a few acc tests --- .../dddsample/acceptance/AdminAcceptanceTest.java | 11 +++++++---- .../dddsample/acceptance/CustomerAcceptanceTest.java | 3 --- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/se/citerus/dddsample/acceptance/AdminAcceptanceTest.java b/src/test/java/se/citerus/dddsample/acceptance/AdminAcceptanceTest.java index ddc0747c..ea2aa883 100644 --- a/src/test/java/se/citerus/dddsample/acceptance/AdminAcceptanceTest.java +++ b/src/test/java/se/citerus/dddsample/acceptance/AdminAcceptanceTest.java @@ -1,17 +1,21 @@ package se.citerus.dddsample.acceptance; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; -import org.springframework.test.annotation.DirtiesContext; -import se.citerus.dddsample.acceptance.pages.*; +import se.citerus.dddsample.acceptance.pages.AdminPage; +import se.citerus.dddsample.acceptance.pages.CargoBookingPage; +import se.citerus.dddsample.acceptance.pages.CargoDestinationPage; +import se.citerus.dddsample.acceptance.pages.CargoDetailsPage; +import se.citerus.dddsample.acceptance.pages.CargoRoutingPage; import java.time.LocalDate; import java.time.temporal.ChronoUnit; import static org.assertj.core.api.Java6Assertions.assertThat; +@Transactional public class AdminAcceptanceTest extends AbstractAcceptanceTest { - @DirtiesContext @Test public void adminSiteCargoListContainsCannedCargo() { AdminPage page = new AdminPage(driver, port); @@ -23,7 +27,6 @@ public void adminSiteCargoListContainsCannedCargo() { .withFailMessage("Cargo list doesn't contain JKL567"); } - @DirtiesContext @Test public void adminSiteCanBookNewCargo() { AdminPage adminPage = new AdminPage(driver, port); diff --git a/src/test/java/se/citerus/dddsample/acceptance/CustomerAcceptanceTest.java b/src/test/java/se/citerus/dddsample/acceptance/CustomerAcceptanceTest.java index 20a8d04e..a8af3843 100644 --- a/src/test/java/se/citerus/dddsample/acceptance/CustomerAcceptanceTest.java +++ b/src/test/java/se/citerus/dddsample/acceptance/CustomerAcceptanceTest.java @@ -13,21 +13,18 @@ public void goToCustomerPage() { customerPage = new CustomerPage(driver, port); } - @DirtiesContext @Test public void customerSiteCanTrackValidCargo() { customerPage.trackCargoWithIdOf("ABC123"); customerPage.expectCargoLocation("New York"); } - @DirtiesContext @Test public void customerSiteErrorsOnInvalidCargo() { customerPage.trackCargoWithIdOf("XXX999"); customerPage.expectErrorFor("Unknown tracking id"); } - @DirtiesContext @Test public void customerSiteNotifiesOnMisdirectedCargo() { customerPage.trackCargoWithIdOf("JKL567");