AYS-218 | DOM Change Testing (#41)

afet-yonetim-sistemi · Apr 7, 2024 · 574e45b · 574e45b
1 parent 470701f
commit 574e45b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/test/java/org/ays/feature/UsersEdit.feature b/src/test/java/org/ays/feature/UsersEdit.feature
@@ -1,4 +1,4 @@
-@Ignore
+@Smoke @Regression
 Feature: Testing Users
 
   Background:

diff --git a/src/test/java/org/ays/pages/UsersPOM.java b/src/test/java/org/ays/pages/UsersPOM.java
@@ -27,7 +27,7 @@ public UsersPOM() {
     @FindBy(id = "lastName")
     private WebElement lastName;
 
-    @FindBy(xpath = "//div/span[@class='ant-select-selection-search']")
+    @FindBy(xpath = "(//div/span[@class='ant-select-selection-search'])[2]")
     private WebElement countryCode;
 
     @FindBy(xpath = "(//div[.='+90 Türkiye'])[2]")
@@ -57,7 +57,7 @@ public UsersPOM() {
     @FindBy(xpath = "//span[contains(@class, 'anticon-edit')]")
     private WebElement usersEditIcon;
 
-    @FindBy(xpath = "(//span[@class='ant-select-selection-item'])[1]")
+    @FindBy(xpath = "(//span[@class='ant-select-selection-item'])[2]")
     private WebElement statusDropdown;
 
     @FindBy(xpath = "//div[.='Active']")
@@ -78,7 +78,7 @@ public UsersPOM() {
     @FindBy(xpath = "//div[@class='ant-table-column-sorters']/span[1]")
     private WebElement createdAtColumn;
 
-    @FindBy(xpath = "(//span[contains(@class, 'anticon-save')])[2]")
+    @FindBy(xpath = "(//button[contains(@class, 'refine-save-button')])[2]")
     private WebElement editSaveButton;
 
     @FindBy(xpath = "//button[@class='ant-modal-close']")

diff --git a/src/test/java/org/ays/step_definitions/UsersEdit.java b/src/test/java/org/ays/step_definitions/UsersEdit.java
@@ -23,14 +23,21 @@ public void editTheStatusSectionInTheUserForm() {
         pageActions.moveToElement(usersPOM.getStatusDropdown());
         pageActions.clickMethod(usersPOM.getStatusDropdown());
 
-        if (usersPOM.getStatusDropdown().getText().equals("Active")) {
-            pageActions.waitUntilClickable(usersPOM.getPassiveOption());
-            pageActions.clickMethod(usersPOM.getPassiveOption());
-        }
-        if (usersPOM.getStatusDropdown().getText().equals("Passive")) {
-            pageActions.waitUntilClickable(usersPOM.getActiveOption());
-            pageActions.clickMethod(usersPOM.getActiveOption());
+        String status = usersPOM.getStatusDropdown().getText();
+        switch (status) {
+
+            case "Active": {
+                pageActions.waitUntilClickable(usersPOM.getPassiveOption());
+                pageActions.clickMethod(usersPOM.getPassiveOption());
+                break;
+            }
+            case "Passive": {
+                pageActions.waitUntilClickable(usersPOM.getActiveOption());
+                pageActions.clickMethod(usersPOM.getActiveOption());
+                break;
+            }
         }
+        pageActions.waitFor(3);
     }
 
     @Then("Click on the save edit button")