Skip to content

Commit 6eae2f0

Browse files
committed
Minor refactoring
1 parent 6207131 commit 6eae2f0

File tree

5 files changed

+32
-11
lines changed

5 files changed

+32
-11
lines changed

pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<maven.compiler.source>17</maven.compiler.source>
1313
<maven.compiler.target>17</maven.compiler.target>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<allure.version>2.25.0</allure.version>
15+
<allure.version>2.29.0</allure.version>
1616
<aspectj.version>1.9.21</aspectj.version>
1717
</properties>
1818

@@ -59,6 +59,16 @@
5959
</dependencies>
6060
<build>
6161
<plugins>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-compiler-plugin</artifactId>
65+
<version>3.8.1</version>
66+
<configuration>
67+
<compilerArgs>
68+
<arg>-parameters</arg>
69+
</compilerArgs>
70+
</configuration>
71+
</plugin>
6272
<plugin>
6373
<groupId>org.apache.maven.plugins</groupId>
6474
<artifactId>maven-surefire-plugin</artifactId>

src/test/java/com/serenitydojo/playwright/toolshop/catalog/AddToCartTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import com.serenitydojo.playwright.toolshop.catalog.pageobjects.*;
44
import com.serenitydojo.playwright.toolshop.fixtures.PlaywrightTestCase;
5+
import io.qameta.allure.Feature;
6+
import io.qameta.allure.Story;
57
import org.assertj.core.api.Assertions;
68
import org.junit.jupiter.api.BeforeEach;
79
import org.junit.jupiter.api.DisplayName;
@@ -10,6 +12,7 @@
1012
import java.util.List;
1113

1214
@DisplayName("Shopping Cart")
15+
@Feature("Shopping Cart")
1316
public class AddToCartTest extends PlaywrightTestCase {
1417

1518
SearchComponent searchComponent;
@@ -33,6 +36,7 @@ void setUp() {
3336
}
3437

3538
@Test
39+
@Story("Check out")
3640
@DisplayName("Checking out a single item")
3741
void whenCheckingOutASingleItem() {
3842
searchComponent.searchBy("pliers");
@@ -56,6 +60,7 @@ void whenCheckingOutASingleItem() {
5660
}
5761

5862
@Test
63+
@Story("Check out")
5964
@DisplayName("Checking out multiple items")
6065
void whenCheckingOutMultipleItems() {
6166
navBar.openHomePage();

src/test/java/com/serenitydojo/playwright/toolshop/catalog/SearchForProductsTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
import com.serenitydojo.playwright.toolshop.catalog.pageobjects.ProductList;
44
import com.serenitydojo.playwright.toolshop.catalog.pageobjects.SearchComponent;
55
import com.serenitydojo.playwright.toolshop.fixtures.PlaywrightTestCase;
6+
import io.qameta.allure.Feature;
7+
import io.qameta.allure.Story;
68
import org.assertj.core.api.Assertions;
79
import org.junit.jupiter.api.BeforeEach;
810
import org.junit.jupiter.api.DisplayName;
911
import org.junit.jupiter.api.Nested;
1012
import org.junit.jupiter.api.Test;
1113

1214
@DisplayName("Searching for products")
15+
@Feature("Searching for products")
1316
public class SearchForProductsTest extends PlaywrightTestCase {
1417

1518
@BeforeEach
@@ -19,6 +22,7 @@ void openHomePage() {
1922

2023
@Nested
2124
@DisplayName("Searching by keyword")
25+
@Story("Searching by keyword")
2226
class SearchingByKeyword {
2327

2428
@Test
@@ -62,5 +66,6 @@ void clearingTheSearchResults() {
6266
var matchingProducts = productList.getProductNames();
6367
Assertions.assertThat(matchingProducts).hasSize(9);
6468
}
69+
6570
}
6671
}

src/test/java/com/serenitydojo/playwright/toolshop/contact/ContactFormTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.serenitydojo.playwright.toolshop.catalog.pageobjects.NavBar;
55
import com.serenitydojo.playwright.toolshop.fixtures.PlaywrightTestCase;
66
import io.qameta.allure.Allure;
7+
import io.qameta.allure.Feature;
8+
import io.qameta.allure.Story;
79
import org.assertj.core.api.Assertions;
810
import org.junit.jupiter.api.BeforeEach;
911
import org.junit.jupiter.api.DisplayName;
@@ -18,19 +20,20 @@
1820
import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
1921

2022
@DisplayName("Contact form")
23+
@Feature("Contact form")
2124
public class ContactFormTest extends PlaywrightTestCase {
2225

2326
ContactForm contactForm;
2427
NavBar navigate;
2528

26-
@DisplayName("When submitting a request")
2729
@BeforeEach
2830
void openContactPage() {
2931
contactForm = new ContactForm(page);
3032
navigate = new NavBar(page);
3133
navigate.toTheContactPage();
3234
}
3335

36+
@Story("Submitting a request")
3437
@DisplayName("Customers can use the contact form to contact us")
3538
@Test
3639
void completeForm() throws URISyntaxException {
@@ -49,12 +52,11 @@ void completeForm() throws URISyntaxException {
4952
.contains("Thanks for your message! We will contact you shortly.");
5053
}
5154

55+
@Story("Submitting a request")
5256
@DisplayName("First name, last name, email and message are mandatory")
53-
@ParameterizedTest
57+
@ParameterizedTest(name = "{arguments} is a mandatory field")
5458
@ValueSource(strings = {"First name", "Last name", "Email", "Message"})
5559
void mandatoryFields(String fieldName) {
56-
Allure.parameter("fieldName", fieldName);
57-
5860
// Fill in the field values
5961
contactForm.setFirstName("Sarah-Jane");
6062
contactForm.setLastName("Smith");
@@ -73,6 +75,7 @@ void mandatoryFields(String fieldName) {
7375
assertThat(errorMessage).isVisible();
7476
}
7577

78+
@Story("Submitting a request")
7679
@DisplayName("The message must be at least 50 characters long")
7780
@Test
7881
void messageTooShort() {
@@ -88,12 +91,11 @@ void messageTooShort() {
8891
assertThat(page.getByRole(AriaRole.ALERT)).hasText("Message must be minimal 50 characters");
8992
}
9093

94+
@Story("Submitting a request")
9195
@DisplayName("The email address must be correctly formatted")
92-
@ParameterizedTest
96+
@ParameterizedTest(name = "'{arguments}' should be rejected")
9397
@ValueSource(strings = {"not-an-email", "not-an.email.com", "notanemail"})
9498
void invalidEmailField(String invalidEmail) {
95-
Allure.parameter("invalidEmail", invalidEmail);
96-
9799
contactForm.setFirstName("Sarah-Jane");
98100
contactForm.setLastName("Smith");
99101
contactForm.setEmail(invalidEmail);
@@ -104,6 +106,4 @@ void invalidEmailField(String invalidEmail) {
104106

105107
assertThat(page.getByRole(AriaRole.ALERT)).hasText("Email format is invalid");
106108
}
107-
108-
109109
}

src/test/java/com/serenitydojo/playwright/toolshop/fixtures/PlaywrightTestCase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public abstract class PlaywrightTestCase {
1919

2020
protected static ThreadLocal<Browser> browser = ThreadLocal.withInitial(() ->
2121
playwright.get().chromium().launch(
22-
new BrowserType.LaunchOptions().setHeadless(true)
22+
new BrowserType.LaunchOptions()
23+
.setHeadless(true)
2324
.setArgs(Arrays.asList("--no-sandbox", "--disable-extensions", "--disable-gpu"))
2425
)
2526
);

0 commit comments

Comments
 (0)