diff --git a/commafeed-server/src/test/java/com/commafeed/e2e/AuthentificationIT.java b/commafeed-server/src/test/java/com/commafeed/e2e/AuthentificationIT.java index 499ce1ab..56ac792e 100644 --- a/commafeed-server/src/test/java/com/commafeed/e2e/AuthentificationIT.java +++ b/commafeed-server/src/test/java/com/commafeed/e2e/AuthentificationIT.java @@ -29,9 +29,7 @@ class AuthentificationIT { void loginFail() { Page page = context.newPage(); page.navigate(getLoginPageUrl()); - page.getByPlaceholder("User Name or E-mail").fill("admin"); - page.getByPlaceholder("Password").fill("wrong_password"); - page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Log in")).click(); + PlaywrightTestUtils.login(page, "admin", "wrong_password"); PlaywrightAssertions.assertThat(page.getByRole(AriaRole.ALERT)).containsText("wrong username or password"); } @@ -48,10 +46,7 @@ class AuthentificationIT { Page page = context.newPage(); page.navigate(getLoginPageUrl()); page.getByText("Sign up!").click(); - page.getByPlaceholder("User Name").fill("user"); - page.getByPlaceholder("E-mail address").fill("user@domain.com"); - page.getByPlaceholder("Password").fill("pass"); - page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")).click(); + PlaywrightTestUtils.register(page, "user", "user@domain.com", "pass"); Locator alert = page.getByRole(AriaRole.ALERT); PlaywrightAssertions.assertThat(alert).containsText("Password must be 8 or more characters in length."); @@ -65,10 +60,7 @@ class AuthentificationIT { Page page = context.newPage(); page.navigate(getLoginPageUrl()); page.getByText("Sign up!").click(); - page.getByPlaceholder("User Name").fill("user"); - page.getByPlaceholder("E-mail address").fill("user@domain.com"); - page.getByPlaceholder("Password").fill("MyPassword1!"); - page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")).click(); + PlaywrightTestUtils.register(page, "user", "user@domain.com", "MyPassword1!"); PlaywrightAssertions.assertThat(page).hasURL("http://localhost:8085/#/app/category/all"); } diff --git a/commafeed-server/src/test/java/com/commafeed/e2e/PlaywrightTestUtils.java b/commafeed-server/src/test/java/com/commafeed/e2e/PlaywrightTestUtils.java index 82370658..6e7c6a5f 100644 --- a/commafeed-server/src/test/java/com/commafeed/e2e/PlaywrightTestUtils.java +++ b/commafeed-server/src/test/java/com/commafeed/e2e/PlaywrightTestUtils.java @@ -10,9 +10,20 @@ import lombok.experimental.UtilityClass; public class PlaywrightTestUtils { public static void login(Page page) { - page.getByPlaceholder("User Name or E-mail").fill("admin"); - page.getByPlaceholder("Password").fill("admin"); + login(page, "admin", "admin"); + } + + public static void login(Page page, String username, String password) { + page.getByPlaceholder("User Name or E-mail").fill(username); + page.getByPlaceholder("Password").fill(password); page.getByRole(AriaRole.BUTTON, new GetByRoleOptions().setName("Log in")).click(); } + public static void register(Page page, String username, String email, String password) { + page.getByPlaceholder("E-mail address").fill(email); + page.getByPlaceholder("User Name").fill(username); + page.getByPlaceholder("Password").fill(password); + page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")).click(); + } + }