diff --git a/pom.xml b/pom.xml index 4538e4d96..87d827e80 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.10 + 3.4.5 @@ -155,7 +155,7 @@ org.seleniumhq.selenium - htmlunit-driver + htmlunit3-driver test diff --git a/src/test/java/se/citerus/dddsample/acceptance/AdminAcceptanceTest.java b/src/test/java/se/citerus/dddsample/acceptance/AdminAcceptanceTest.java index ddc0747c2..ea2aa883a 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 20a8d04e2..a8af38437 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");