From 604d84cc0f4c91b60d8455dfea1d5d47eb0a25a5 Mon Sep 17 00:00:00 2001 From: yavuzcinar Date: Thu, 14 Mar 2024 16:53:17 +0300 Subject: [PATCH 1/9] AYS-191 --- .../AysConfigurationProperty.java | 4 ++ .../SuperAdminRegistrationFilter.feature | 13 +++++ .../java/org/ays/pages/SuperAdminPOM.java | 35 ++++++++++++++ .../SuperAdminRegistrationFilter.java | 47 +++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature create mode 100644 src/test/java/org/ays/pages/SuperAdminPOM.java create mode 100644 src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java diff --git a/src/test/java/org/ays/configuration/AysConfigurationProperty.java b/src/test/java/org/ays/configuration/AysConfigurationProperty.java index 7c2998e..21d3363 100644 --- a/src/test/java/org/ays/configuration/AysConfigurationProperty.java +++ b/src/test/java/org/ays/configuration/AysConfigurationProperty.java @@ -35,6 +35,10 @@ public static class AdminUserOne { public static final String USERNAME = PROPERTIES.getProperty("institution_one.admin_user_one.username"); public static final String PASSWORD = PROPERTIES.getProperty("institution_one.admin_user_one.password"); } + public static class SuperAdminUserOne { + public static final String USERNAME = PROPERTIES.getProperty("institution.super_admin_user_one.username"); + public static final String PASSWORD = PROPERTIES.getProperty("institution.super_admin_user_one.password"); + } } private static class AysConfigurationException extends RuntimeException { diff --git a/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature b/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature new file mode 100644 index 0000000..a8daad0 --- /dev/null +++ b/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature @@ -0,0 +1,13 @@ +@Regression @Smoke +Feature: Testing Super Admin Registration List + + Background: + Given Open the institution login page + When Enter the super admin username and password + And Click the Login button + + Scenario: Testing registration list by super admin user + When Click on the registration-application + When Click filter icon + And Selects available option from the status menu + Then Click filter button \ No newline at end of file diff --git a/src/test/java/org/ays/pages/SuperAdminPOM.java b/src/test/java/org/ays/pages/SuperAdminPOM.java new file mode 100644 index 0000000..08950fb --- /dev/null +++ b/src/test/java/org/ays/pages/SuperAdminPOM.java @@ -0,0 +1,35 @@ +package org.ays.pages; + +import lombok.Getter; +import org.ays.browser.AysBrowser; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +@Getter +public class SuperAdminPOM { + public SuperAdminPOM() { + PageFactory.initElements(AysBrowser.getWebDriver(), this); + } + + @FindBy(xpath = "//a[normalize-space()='Registration Applications']") + private WebElement registrationApplication; + + @FindBy(xpath = "//button[@class='ant-btn css-2sv4ty ant-btn-default ant-btn-icon-only']") + private WebElement filterIcon; + + @FindBy(xpath = "//div[@class='ant-select-selection-overflow']") + private WebElement statusBar; + + @FindBy(xpath = "//div[@id='statuses_list_0']") + private WebElement waiting; + + @FindBy(xpath = "//button[@id='filter-button']") + private WebElement filtersButton; + + + + + +} + diff --git a/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java b/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java new file mode 100644 index 0000000..bacc53d --- /dev/null +++ b/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java @@ -0,0 +1,47 @@ +package org.ays.step_definitions; + +import io.cucumber.java.en.And; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; +import org.ays.browser.AysPageActions; +import org.ays.configuration.AysConfigurationProperty; +import org.ays.pages.LoginPOM; +import org.ays.pages.SuperAdminPOM; + +public class SuperAdminRegistrationFilter { + private final LoginPOM loginPOM = new LoginPOM(); + private final AysPageActions pageActions = new AysPageActions(); + private final SuperAdminPOM superAdminPOM = new SuperAdminPOM(); + + @When("Enter the super admin username and password") + public void enter_the_username_and_password() { + this.pageActions.sendKeysMethod(loginPOM.getLoginUsername(), AysConfigurationProperty.InstitutionOne.SuperAdminUserOne.USERNAME); + this.pageActions.sendKeysMethod(loginPOM.getLoginPassword(), AysConfigurationProperty.InstitutionOne.SuperAdminUserOne.PASSWORD); + } + + @When("Click on the registration-application") + public void Click_on_the_assignments_tab() { + pageActions.waitUntilClickable(superAdminPOM.getRegistrationApplication()); + pageActions.clickMethod(superAdminPOM.getRegistrationApplication()); + } + + @And("Click filter icon") + public void Click_on_the_filter_icon() { + pageActions.moveToElement(superAdminPOM.getFilterIcon()); + pageActions.waitUntilClickable(superAdminPOM.getFilterIcon()); + pageActions.clickElementWithJavaScript(superAdminPOM.getFilterIcon()); + } + + @And("Selects available option from the status menu") + public void Select_the_available_option_from_the_status_menu() { + pageActions.clickMethod(superAdminPOM.getStatusBar()); + pageActions.clickElementWithJavaScript(superAdminPOM.getWaiting()); + pageActions.clickMethod(superAdminPOM.getStatusBar()); + } + + @Then("Click filter button") + public void Click_on_the_filter_button() { + pageActions.clickMethod(superAdminPOM.getFiltersButton()); + } +} From 9f680c0e826a9d53a629c1fbe9315eb5a1f48033 Mon Sep 17 00:00:00 2001 From: yavuzcinar Date: Mon, 18 Mar 2024 12:19:53 +0300 Subject: [PATCH 2/9] review change added --- .../feature/SuperAdminRegistrationFilter.feature | 2 +- src/test/java/org/ays/pages/SuperAdminPOM.java | 4 ---- .../SuperAdminRegistrationFilter.java | 15 ++++++++------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature b/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature index a8daad0..71b7127 100644 --- a/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature +++ b/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature @@ -9,5 +9,5 @@ Feature: Testing Super Admin Registration List Scenario: Testing registration list by super admin user When Click on the registration-application When Click filter icon - And Selects available option from the status menu + And Select available option from the status menu Then Click filter button \ No newline at end of file diff --git a/src/test/java/org/ays/pages/SuperAdminPOM.java b/src/test/java/org/ays/pages/SuperAdminPOM.java index 08950fb..d6819fb 100644 --- a/src/test/java/org/ays/pages/SuperAdminPOM.java +++ b/src/test/java/org/ays/pages/SuperAdminPOM.java @@ -27,9 +27,5 @@ public SuperAdminPOM() { @FindBy(xpath = "//button[@id='filter-button']") private WebElement filtersButton; - - - - } diff --git a/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java b/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java index bacc53d..9ff388b 100644 --- a/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java +++ b/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java @@ -11,37 +11,38 @@ public class SuperAdminRegistrationFilter { private final LoginPOM loginPOM = new LoginPOM(); - private final AysPageActions pageActions = new AysPageActions(); private final SuperAdminPOM superAdminPOM = new SuperAdminPOM(); + private final AysPageActions pageActions = new AysPageActions(); @When("Enter the super admin username and password") - public void enter_the_username_and_password() { + public void Enter_the_super_admin_username_and_password() { this.pageActions.sendKeysMethod(loginPOM.getLoginUsername(), AysConfigurationProperty.InstitutionOne.SuperAdminUserOne.USERNAME); this.pageActions.sendKeysMethod(loginPOM.getLoginPassword(), AysConfigurationProperty.InstitutionOne.SuperAdminUserOne.PASSWORD); } @When("Click on the registration-application") - public void Click_on_the_assignments_tab() { + public void Click_on_the_registration_application() { pageActions.waitUntilClickable(superAdminPOM.getRegistrationApplication()); pageActions.clickMethod(superAdminPOM.getRegistrationApplication()); } @And("Click filter icon") - public void Click_on_the_filter_icon() { + public void Click_filter_icon() { + pageActions.waitUntilVisible(superAdminPOM.getFilterIcon()); pageActions.moveToElement(superAdminPOM.getFilterIcon()); pageActions.waitUntilClickable(superAdminPOM.getFilterIcon()); pageActions.clickElementWithJavaScript(superAdminPOM.getFilterIcon()); } - @And("Selects available option from the status menu") - public void Select_the_available_option_from_the_status_menu() { + @And("Select available option from the status menu") + public void Select_available_option_from_the_status_menu() { pageActions.clickMethod(superAdminPOM.getStatusBar()); pageActions.clickElementWithJavaScript(superAdminPOM.getWaiting()); pageActions.clickMethod(superAdminPOM.getStatusBar()); } @Then("Click filter button") - public void Click_on_the_filter_button() { + public void Click_filter_button() { pageActions.clickMethod(superAdminPOM.getFiltersButton()); } } From cae0bb72dd5e4272fbe848d4889f060745220888 Mon Sep 17 00:00:00 2001 From: yavuzcinar Date: Mon, 18 Mar 2024 23:34:55 +0300 Subject: [PATCH 3/9] AYS-191|reviewed changes added and commit name changed --- src/test/java/org/ays/feature/UsersShow.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/ays/feature/UsersShow.feature b/src/test/java/org/ays/feature/UsersShow.feature index 8df4bca..7646e49 100644 --- a/src/test/java/org/ays/feature/UsersShow.feature +++ b/src/test/java/org/ays/feature/UsersShow.feature @@ -1,4 +1,4 @@ -@Regression @Smoke +@Ignore Feature: Testing Users Background: From e9e6c917d7b58ba2908975604b94383b7226da3d Mon Sep 17 00:00:00 2001 From: cglais Date: Wed, 20 Mar 2024 13:23:59 +0300 Subject: [PATCH 4/9] AYS-191 | Assertion step added in SuperAdminRegistrationFilter scenario. --- .../java/org/ays/browser/AysPageActions.java | 5 +++++ .../java/org/ays/feature/Assignments.feature | 10 ---------- .../org/ays/feature/AssignmentsDelete.feature | 1 + .../SuperAdminRegistrationFilter.feature | 3 ++- src/test/java/org/ays/pages/SuperAdminPOM.java | 7 ++++++- .../SuperAdminRegistrationFilter.java | 18 +++++++++++++++++- 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/test/java/org/ays/browser/AysPageActions.java b/src/test/java/org/ays/browser/AysPageActions.java index e0095c5..7660081 100644 --- a/src/test/java/org/ays/browser/AysPageActions.java +++ b/src/test/java/org/ays/browser/AysPageActions.java @@ -11,6 +11,7 @@ import org.openqa.selenium.support.ui.WebDriverWait; import java.time.Duration; +import java.util.List; @Slf4j public class AysPageActions { @@ -37,6 +38,10 @@ public void waitUntilVisible(WebElement element) { webDriverWait.until(ExpectedConditions.visibilityOf(element)); } + public void waitUntilVisible(List element) { + webDriverWait.until(ExpectedConditions.visibilityOfAllElements(element)); + } + public void waitUntilClickable(WebElement element) { webDriverWait.until(ExpectedConditions.elementToBeClickable(element)); } diff --git a/src/test/java/org/ays/feature/Assignments.feature b/src/test/java/org/ays/feature/Assignments.feature index 49b39cd..1abe4ac 100644 --- a/src/test/java/org/ays/feature/Assignments.feature +++ b/src/test/java/org/ays/feature/Assignments.feature @@ -43,16 +43,6 @@ Feature: Testing Assignments And Enter invalid coordinates while filling out the assignment form Then Click on the save button - @Smoke - Scenario: Delete the Existing Assignment - When Click on the assignments tab - And Click on the filter icon - And Select the available option from the status menu - Then Click on the filter button - And Click on the trash bin icon for the top assignment - And Click on the delete button - Then Validate the success message - @Smoke Scenario: View the Location of the Current Assignment When Click on the assignments tab diff --git a/src/test/java/org/ays/feature/AssignmentsDelete.feature b/src/test/java/org/ays/feature/AssignmentsDelete.feature index 7bbd0cd..91dbb4c 100644 --- a/src/test/java/org/ays/feature/AssignmentsDelete.feature +++ b/src/test/java/org/ays/feature/AssignmentsDelete.feature @@ -1,3 +1,4 @@ +@Ignore Feature: Testing Assignments Background: diff --git a/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature b/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature index 71b7127..910711d 100644 --- a/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature +++ b/src/test/java/org/ays/feature/SuperAdminRegistrationFilter.feature @@ -10,4 +10,5 @@ Feature: Testing Super Admin Registration List When Click on the registration-application When Click filter icon And Select available option from the status menu - Then Click filter button \ No newline at end of file + Then Click filter button + And All status row can show "Waiting" \ No newline at end of file diff --git a/src/test/java/org/ays/pages/SuperAdminPOM.java b/src/test/java/org/ays/pages/SuperAdminPOM.java index d6819fb..3b0adae 100644 --- a/src/test/java/org/ays/pages/SuperAdminPOM.java +++ b/src/test/java/org/ays/pages/SuperAdminPOM.java @@ -6,6 +6,8 @@ import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.PageFactory; +import java.util.List; + @Getter public class SuperAdminPOM { public SuperAdminPOM() { @@ -15,7 +17,7 @@ public SuperAdminPOM() { @FindBy(xpath = "//a[normalize-space()='Registration Applications']") private WebElement registrationApplication; - @FindBy(xpath = "//button[@class='ant-btn css-2sv4ty ant-btn-default ant-btn-icon-only']") + @FindBy(xpath = "(//button)[5]") private WebElement filterIcon; @FindBy(xpath = "//div[@class='ant-select-selection-overflow']") @@ -27,5 +29,8 @@ public SuperAdminPOM() { @FindBy(xpath = "//button[@id='filter-button']") private WebElement filtersButton; + @FindBy(xpath = "//td/span[contains(@class,'ant-tag-blue')]") + private List statusColumn; + } diff --git a/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java b/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java index 9ff388b..a21136d 100644 --- a/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java +++ b/src/test/java/org/ays/step_definitions/SuperAdminRegistrationFilter.java @@ -1,13 +1,17 @@ package org.ays.step_definitions; import io.cucumber.java.en.And; -import io.cucumber.java.en.Given; import io.cucumber.java.en.Then; import io.cucumber.java.en.When; import org.ays.browser.AysPageActions; import org.ays.configuration.AysConfigurationProperty; import org.ays.pages.LoginPOM; import org.ays.pages.SuperAdminPOM; +import org.openqa.selenium.WebElement; + +import java.util.List; +import org.testng.Assert; + public class SuperAdminRegistrationFilter { private final LoginPOM loginPOM = new LoginPOM(); @@ -45,4 +49,16 @@ public void Select_available_option_from_the_status_menu() { public void Click_filter_button() { pageActions.clickMethod(superAdminPOM.getFiltersButton()); } + + @And("All status row can show {string}") + public void allStatusRowCanShow(String expectedStatus) { + + pageActions.waitUntilVisible(superAdminPOM.getStatusColumn()); + List statusCells = superAdminPOM.getStatusColumn(); + + for (WebElement cell : statusCells) { + Assert.assertEquals(cell.getText(), expectedStatus); + + } + } } From 8c4153e0b346dc1ecc644973c71c71a6a95e0df5 Mon Sep 17 00:00:00 2001 From: cglais Date: Wed, 20 Mar 2024 14:48:00 +0300 Subject: [PATCH 5/9] AYS-191 | Tag name changed --- src/test/java/org/ays/feature/AssignmentsDelete.feature | 2 +- src/test/java/org/ays/feature/AssignmentsEdit.feature | 2 +- src/test/java/org/ays/feature/UsersDelete.feature | 2 +- src/test/java/org/ays/feature/UsersEdit.feature | 2 +- src/test/java/org/ays/feature/UsersShow.feature | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/ays/feature/AssignmentsDelete.feature b/src/test/java/org/ays/feature/AssignmentsDelete.feature index 91dbb4c..8f42ba2 100644 --- a/src/test/java/org/ays/feature/AssignmentsDelete.feature +++ b/src/test/java/org/ays/feature/AssignmentsDelete.feature @@ -1,4 +1,4 @@ -@Ignore +@Ignored Feature: Testing Assignments Background: diff --git a/src/test/java/org/ays/feature/AssignmentsEdit.feature b/src/test/java/org/ays/feature/AssignmentsEdit.feature index c988b18..6e6c174 100644 --- a/src/test/java/org/ays/feature/AssignmentsEdit.feature +++ b/src/test/java/org/ays/feature/AssignmentsEdit.feature @@ -1,4 +1,4 @@ -@Ignore +@Ignored Feature: Testing Assignments Background: diff --git a/src/test/java/org/ays/feature/UsersDelete.feature b/src/test/java/org/ays/feature/UsersDelete.feature index ebbced0..2a0fdc3 100644 --- a/src/test/java/org/ays/feature/UsersDelete.feature +++ b/src/test/java/org/ays/feature/UsersDelete.feature @@ -1,4 +1,4 @@ -@Ignore +@Ignored Feature: Testing Users Background: diff --git a/src/test/java/org/ays/feature/UsersEdit.feature b/src/test/java/org/ays/feature/UsersEdit.feature index 7178384..43e3ae4 100644 --- a/src/test/java/org/ays/feature/UsersEdit.feature +++ b/src/test/java/org/ays/feature/UsersEdit.feature @@ -1,4 +1,4 @@ -@Ignore +@Ignored Feature: Testing Users Background: diff --git a/src/test/java/org/ays/feature/UsersShow.feature b/src/test/java/org/ays/feature/UsersShow.feature index 7646e49..e58e26b 100644 --- a/src/test/java/org/ays/feature/UsersShow.feature +++ b/src/test/java/org/ays/feature/UsersShow.feature @@ -1,4 +1,4 @@ -@Ignore +@Ignored Feature: Testing Users Background: From 6b575342ed598be261c2232549e472b4fb8d968e Mon Sep 17 00:00:00 2001 From: cglais Date: Wed, 20 Mar 2024 15:57:03 +0300 Subject: [PATCH 6/9] AYS-191 | `UsersCreate` scenario refactored --- src/test/java/org/ays/step_definitions/UsersCreate.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/ays/step_definitions/UsersCreate.java b/src/test/java/org/ays/step_definitions/UsersCreate.java index ffe443e..772e399 100644 --- a/src/test/java/org/ays/step_definitions/UsersCreate.java +++ b/src/test/java/org/ays/step_definitions/UsersCreate.java @@ -59,11 +59,14 @@ public void errorMassageIsDisplayed(String message) { @And("Enter invalid characters in the phone number field while filling out the users form") public void enterInvalidCharactersInThePhoneNumberFieldWhileFillingOutTheUsersForm() { + pageActions.waitUntilVisible(usersPOM.getFirstName()); pageActions.sendKeysMethod(usersPOM.getFirstName(), AysRandomUtil.generateFirstName()); + pageActions.waitUntilVisible(usersPOM.getLastName()); pageActions.sendKeysMethod(usersPOM.getLastName(), AysRandomUtil.generateLastName()); pageActions.clickMethod(usersPOM.getCountryCode()); pageActions.clickMethod(usersPOM.getTurkeyCountryCode()); - pageActions.sendKeysMethod(usersPOM.getPhoneNumber(), "abc"); + pageActions.waitUntilVisible(usersPOM.getPhoneNumber()); + pageActions.sendKeysMethod(usersPOM.getPhoneNumber(), "123"); } @And("{string} massage is displayed") From 275e9d8bb170c32db38e273de8598c480e53e64b Mon Sep 17 00:00:00 2001 From: cglais Date: Wed, 20 Mar 2024 16:14:16 +0300 Subject: [PATCH 7/9] AYS-191 | More more wait condition added before all steps --- .../java/org/ays/step_definitions/UsersCreate.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/java/org/ays/step_definitions/UsersCreate.java b/src/test/java/org/ays/step_definitions/UsersCreate.java index 772e399..dd4dc8e 100644 --- a/src/test/java/org/ays/step_definitions/UsersCreate.java +++ b/src/test/java/org/ays/step_definitions/UsersCreate.java @@ -20,10 +20,13 @@ public void click_on_the_users_tab() { @When("Fill out the users form") public void fill_out_the_users_form() { + pageActions.waitUntilVisible(usersPOM.getFirstName()); pageActions.sendKeysMethod(usersPOM.getFirstName(), AysRandomUtil.generateFirstName()); + pageActions.waitUntilVisible(usersPOM.getLastName()); pageActions.sendKeysMethod(usersPOM.getLastName(), AysRandomUtil.generateLastName()); pageActions.clickMethod(usersPOM.getCountryCode()); pageActions.clickMethod(usersPOM.getTurkeyCountryCode()); + pageActions.waitUntilVisible(usersPOM.getPhoneNumber()); pageActions.sendKeysMethod(usersPOM.getPhoneNumber(), AysRandomUtil.generatePhoneNumber()); } @@ -35,19 +38,25 @@ public void successMessageIsDisplayed(String message) { @And("Enter invalid characters in the name field while filling out the users form") public void enterInvalidCharactersInTheNameFieldWhileFillingOutTheUsersForm() { + pageActions.waitUntilVisible(usersPOM.getFirstName()); pageActions.sendKeysMethod(usersPOM.getFirstName(), "?--/-**-8965"); + pageActions.waitUntilVisible(usersPOM.getLastName()); pageActions.sendKeysMethod(usersPOM.getLastName(), AysRandomUtil.generateLastName()); pageActions.clickMethod(usersPOM.getCountryCode()); pageActions.clickMethod(usersPOM.getTurkeyCountryCode()); + pageActions.waitUntilVisible(usersPOM.getPhoneNumber()); pageActions.sendKeysMethod(usersPOM.getPhoneNumber(), AysRandomUtil.generatePhoneNumber()); } @And("Enter invalid characters in the last name field while filling out the users form") public void enterInvalidCharactersInTheLastNameFieldWhileFillingOutTheUsersForm() { + pageActions.waitUntilVisible(usersPOM.getFirstName()); pageActions.sendKeysMethod(usersPOM.getFirstName(), AysRandomUtil.generateFirstName()); + pageActions.waitUntilVisible(usersPOM.getLastName()); pageActions.sendKeysMethod(usersPOM.getLastName(), "?--/-**-8965"); pageActions.clickMethod(usersPOM.getCountryCode()); pageActions.clickMethod(usersPOM.getTurkeyCountryCode()); + pageActions.waitUntilVisible(usersPOM.getPhoneNumber()); pageActions.sendKeysMethod(usersPOM.getPhoneNumber(), AysRandomUtil.generatePhoneNumber()); } @@ -71,6 +80,7 @@ public void enterInvalidCharactersInThePhoneNumberFieldWhileFillingOutTheUsersFo @And("{string} massage is displayed") public void massageIsDisplayed(String message) { + pageActions.waitUntilVisible(usersPOM.getInvalidPhoneNumberMessage()); Assert.assertEquals(usersPOM.getInvalidPhoneNumberMessage().getText(), message); } From a4cf689130c89aff8ee63a7d2506f47162f6a2b2 Mon Sep 17 00:00:00 2001 From: cglais Date: Wed, 20 Mar 2024 21:02:40 +0300 Subject: [PATCH 8/9] AYS-191 | Cucumber report file added. --- src/test/java/org/ays/runners/RunnerForRegressionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/ays/runners/RunnerForRegressionTest.java b/src/test/java/org/ays/runners/RunnerForRegressionTest.java index 68876ab..01c6466 100644 --- a/src/test/java/org/ays/runners/RunnerForRegressionTest.java +++ b/src/test/java/org/ays/runners/RunnerForRegressionTest.java @@ -2,6 +2,6 @@ import io.cucumber.testng.CucumberOptions; -@CucumberOptions(tags = "@Regression") +@CucumberOptions(tags = "@Regression",publish = true) public class RunnerForRegressionTest extends AysAbstractTestNGCucumberTests { } From ad1c96042170d7f9897249de23a80ec6f62dd2a4 Mon Sep 17 00:00:00 2001 From: cglais Date: Wed, 20 Mar 2024 21:35:02 +0300 Subject: [PATCH 9/9] AYS-191 | Super Admin Information added to yml file --- .github/workflows/application-health-checker.yml | 6 ++++++ .github/workflows/pull-request-checker.yml | 6 ++++++ sample_configuration.properties | 4 +++- src/test/java/org/ays/runners/RunnerForRegressionTest.java | 5 ++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/application-health-checker.yml b/.github/workflows/application-health-checker.yml index f0209d4..21ddc67 100644 --- a/.github/workflows/application-health-checker.yml +++ b/.github/workflows/application-health-checker.yml @@ -40,5 +40,11 @@ jobs: - name: Replace institution_one.admin_user_one.password in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.password in configuration.properties run: sed 's|'{INSTITUTION_ONE_ADMIN_USER_ONE_PASSWORD}'|'${{ secrets.AYS_INSTITUTION_ONE_ADMIN_USER_ONE_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties + - name: Replace institution.super_admin_user_one.username in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.username in configuration.properties + run: sed 's|'{INSTITUTION_SUPER_ADMIN_USER_ONE_USERNAME}'|'${{ secrets.AYS_INSTITUTION_SUPER_ADMIN_USER_ONE_USERNAME }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties + + - name: Replace institution.super_admin_user_one.password in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.password in configuration.properties + run: sed 's|'{INSTITUTION_SUPER_ADMIN_USER_ONE_PASSWORD}'|'${{ secrets.AYS_INSTITUTION_SUPER_ADMIN_USER_ONE_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties + - name: Build with Maven # Step to build the project with Maven run: mvn clean test -P weekly \ No newline at end of file diff --git a/.github/workflows/pull-request-checker.yml b/.github/workflows/pull-request-checker.yml index d689de2..a820635 100644 --- a/.github/workflows/pull-request-checker.yml +++ b/.github/workflows/pull-request-checker.yml @@ -46,6 +46,12 @@ jobs: - name: Replace institution_one.admin_user_one.password in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.password in configuration.properties run: sed 's|'{INSTITUTION_ONE_ADMIN_USER_ONE_PASSWORD}'|'${{ secrets.AYS_INSTITUTION_ONE_ADMIN_USER_ONE_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties + - name: Replace institution.super_admin_user_one.username in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.username in configuration.properties + run: sed 's|'{INSTITUTION_SUPER_ADMIN_USER_ONE_USERNAME}'|'${{ secrets.AYS_INSTITUTION_SUPER_ADMIN_USER_ONE_USERNAME }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties + + - name: Replace institution.super_admin_user_one.password in configuration.properties # Step to replace the placeholder institution_one.admin_user_one.password in configuration.properties + run: sed 's|'{INSTITUTION_SUPER_ADMIN_USER_ONE_PASSWORD}'|'${{ secrets.AYS_INSTITUTION_SUPER_ADMIN_USER_ONE_PASSWORD }}'|g' configuration.properties >> temp_configuration.properties ; rm configuration.properties ; mv temp_configuration.properties configuration.properties + - name: Build with Maven # Step to build the project with Maven run: mvn clean test -P weekly diff --git a/sample_configuration.properties b/sample_configuration.properties index 78ffa13..701f06f 100644 --- a/sample_configuration.properties +++ b/sample_configuration.properties @@ -1,3 +1,5 @@ ui.url={UI_URL} institution_one.admin_user_one.username={INSTITUTION_ONE_ADMIN_USER_ONE_USERNAME} -institution_one.admin_user_one.password={INSTITUTION_ONE_ADMIN_USER_ONE_PASSWORD} \ No newline at end of file +institution_one.admin_user_one.password={INSTITUTION_ONE_ADMIN_USER_ONE_PASSWORD} +institution.super_admin_user_one.username={INSTITUTION_SUPER_ADMIN_USER_ONE_USERNAME} +institution.super_admin_user_one.password={INSTITUTION_SUPER_ADMIN_USER_ONE_PASSWORD} \ No newline at end of file diff --git a/src/test/java/org/ays/runners/RunnerForRegressionTest.java b/src/test/java/org/ays/runners/RunnerForRegressionTest.java index 01c6466..8b6e7ec 100644 --- a/src/test/java/org/ays/runners/RunnerForRegressionTest.java +++ b/src/test/java/org/ays/runners/RunnerForRegressionTest.java @@ -2,6 +2,9 @@ import io.cucumber.testng.CucumberOptions; -@CucumberOptions(tags = "@Regression",publish = true) +@CucumberOptions( + plugin = {"pretty"}, + tags = "@Regression", publish = true +) public class RunnerForRegressionTest extends AysAbstractTestNGCucumberTests { }