Skip to content
This repository was archived by the owner on Apr 20, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions src/test/java/hotel/ReserveTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,21 @@ void testPageInitValue() {
() -> assertEquals("お得な特典付きプラン", reservePage.getPlanName()),
() -> assertEquals(tomorrow, reservePage.getReserveDate()),
() -> assertEquals("1", reservePage.getReserveTerm()),
() -> assertEquals("1", reservePage.getHeadCount())
() -> assertEquals("1", reservePage.getHeadCount()),
() -> assertFalse(reservePage.isEmailDisplayed()),
() -> assertFalse(reservePage.isTelDisplayed())
);
reservePage.setContact(Contact.メールでのご連絡);
assertAll("メール連絡選択時",
() -> assertTrue(reservePage.isEmailDisplayed()),
() -> assertFalse(reservePage.isTelDisplayed()),
() -> assertTrue(reservePage.getEmail().isEmpty())
);
reservePage.setContact(Contact.電話でのご連絡);
assertAll("電話連絡選択時",
() -> assertFalse(reservePage.isEmailDisplayed()),
() -> assertTrue(reservePage.isTelDisplayed()),
() -> assertTrue(reservePage.getTel().isEmpty())
);

driver.switchTo().frame("room");
Expand Down Expand Up @@ -126,10 +140,23 @@ void testPageInitValueLogin() {
() -> assertEquals("1", reservePage.getReserveTerm()),
() -> assertEquals("2", reservePage.getHeadCount()),
() -> assertEquals("山田一郎", reservePage.getUsername()),
() -> assertEquals("ichiro@example.com", reservePage.getEmail()),
() -> assertFalse(reservePage.isEmailDisplayed()),
() -> assertFalse(reservePage.isTelDisplayed())
);
reservePage.setContact(Contact.メールでのご連絡);
assertAll("メール連絡選択時",
() -> assertTrue(reservePage.isEmailDisplayed()),
() -> assertFalse(reservePage.isTelDisplayed()),
() -> assertEquals("ichiro@example.com", reservePage.getEmail())
);
reservePage.setContact(Contact.電話でのご連絡);
assertAll("電話連絡選択時",
() -> assertFalse(reservePage.isEmailDisplayed()),
() -> assertTrue(reservePage.isTelDisplayed()),
() -> assertEquals("01234567891", reservePage.getTel())
);


driver.switchTo().frame("room");
var roomPage = new RoomPage(driver);
assertEquals("プレミアムツイン", roomPage.getHeader());
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/hotel/pages/ReservePage.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,22 @@ public void setEmail(String email) {
emailInput.sendKeys(email);
}

public boolean isEmailDisplayed() {
var emailInput = driver.findElement(By.id("email"));
return emailInput.isDisplayed();
}

public void setTel(String tel) {
var telInput = driver.findElement(By.id("tel"));
telInput.clear();
telInput.sendKeys(tel);
}

public boolean isTelDisplayed() {
var telInput = driver.findElement(By.id("tel"));
return telInput.isDisplayed();
}

public void setComment(String comment) {
var commentTextArea = driver.findElement(By.id("comment"));
commentTextArea.clear();
Expand Down