schrodinger:audit test update

Evolveum · Feb 2, 2021 · 6dc3286 · 6dc3286
1 parent e0cfe82
commit 6dc3286
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 18 deletions.
diff --git a/.../src/test/java/com/evolveum/midpoint/testing/schrodinger/page/AuditLogViewerPageTest.java b/.../src/test/java/com/evolveum/midpoint/testing/schrodinger/page/AuditLogViewerPageTest.java
@@ -28,7 +28,7 @@ public void test00100returnBackToAuditLogDetails() {
                     .clickByName("auditLogViewerTestUser")
                         .selectTabBasic()
                             .form()
-                                .changeAttributeValue("name", "auditLogViewerTestUser", "auditLogViewerTestUser1")
+                                .changeAttributeValue("Name", "auditLogViewerTestUser", "auditLogViewerTestUser1")
                                 .and()
                             .and()
                         .clickSave();
@@ -37,11 +37,11 @@ public void test00100returnBackToAuditLogDetails() {
                     .table()
                         .search()
                             .referencePanelByItemName("Target", true)
-                            .inputRefName("auditLogViewer", "auditLogViewerTestUser")
+                            .inputRefName("auditLogViewer", "auditLogViewerTestUser1")
                             .updateSearch()
                         .and()
                     .clickByRowColumnNumber(0, 0);
-        detailsPage.deltaListPanel()
+        detailsPage.deltaPanel()
                     .header()
                         .assertIsLink()
                         .clickNameLink()

diff --git a/...inger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/search/Search.java b/...inger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/search/Search.java
@@ -14,11 +14,15 @@
 import com.evolveum.midpoint.schrodinger.component.common.InputBox;
 import com.evolveum.midpoint.schrodinger.util.Schrodinger;
 
+import com.evolveum.midpoint.schrodinger.util.Utils;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.interactions.Actions;
 import org.testng.Assert;
 
 import static com.codeborne.selenide.Selectors.byText;
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
 
 /**
  * Created by Viliam Repan (lazyman).
@@ -175,7 +179,7 @@ public SelenideElement getItemByName(String name) {
     }
 
     private SelenideElement getDisplayedPopover() {
-        return getParentElement().$x(".//div[@data-s-id='popover']").waitUntil(Condition.visible, MidPoint.TIMEOUT_DEFAULT_2_S);
+        return $(By.className("search-popover")).waitUntil(Condition.visible, MidPoint.TIMEOUT_DEFAULT_2_S);
     }
 
 

diff --git a/.../main/java/com/evolveum/midpoint/schrodinger/component/prism/show/PartialSceneHeader.java b/.../main/java/com/evolveum/midpoint/schrodinger/component/prism/show/PartialSceneHeader.java
@@ -6,8 +6,10 @@
  */
 package com.evolveum.midpoint.schrodinger.component.prism.show;
 
+import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 
+import com.evolveum.midpoint.schrodinger.MidPoint;
 import com.evolveum.midpoint.schrodinger.component.Component;
 import com.evolveum.midpoint.schrodinger.page.AssignmentHolderDetailsPage;
 import com.evolveum.midpoint.schrodinger.page.org.OrgPage;
@@ -57,20 +59,23 @@ private boolean changedObjectTypeEquals(String expectedValue) {
     }
 
     public AssignmentHolderDetailsPage clickNameLink() {
-        if (changedObjectTypeEquals("user")) {
-            return new UserPage();
-        }
-        if (changedObjectTypeEquals("role")) {
-            return new RolePage();
+        if (!isLink()) {
+            return null;
         }
-        if (changedObjectTypeEquals("service")) {
-            return new ServicePage();
-        }
-        if (changedObjectTypeEquals("org")) {
-            return new OrgPage();
+        AssignmentHolderDetailsPage page = null;
+        if (changedObjectTypeEquals("user")) {
+            page = new UserPage();
+        } else if (changedObjectTypeEquals("role")) {
+            page = new RolePage();
+        } else if (changedObjectTypeEquals("service")) {
+            page = new ServicePage();
+        } else if (changedObjectTypeEquals("org")) {
+            page = new OrgPage();
         }
+        getNameLink().click();
+        Selenide.sleep(MidPoint.TIMEOUT_SHORT_4_S);
 
-        return null;
+        return page;
     }
 
     public boolean isLink() {

diff --git a/...er/src/main/java/com/evolveum/midpoint/schrodinger/component/report/AuditRecordTable.java b/...er/src/main/java/com/evolveum/midpoint/schrodinger/component/report/AuditRecordTable.java
@@ -43,7 +43,8 @@ public AuditLogViewerDetailsPage clickByName(String name) {
     }
 
     public AuditLogViewerDetailsPage clickByRowColumnNumber(int rowNumber, int columnNumber) {
-        getCell(rowNumber, columnNumber).click();
+        getCell(rowNumber, columnNumber)
+                .$(By.tagName("a")).click();
         Selenide.sleep(MidPoint.TIMEOUT_DEFAULT_2_S);
         return new AuditLogViewerDetailsPage();
     }

diff --git a/...rc/main/java/com/evolveum/midpoint/schrodinger/page/report/AuditLogViewerDetailsPage.java b/...rc/main/java/com/evolveum/midpoint/schrodinger/page/report/AuditLogViewerDetailsPage.java
@@ -16,8 +16,8 @@
 
 public class AuditLogViewerDetailsPage extends BasicPage {
 
-    public ScenePanel<AuditLogViewerDetailsPage> deltaListPanel() {
-        SelenideElement el = $x(".//div[@data-s-id='deltaListPanel']").waitUntil(Condition.visible, MidPoint.TIMEOUT_DEFAULT_2_S);
+    public ScenePanel<AuditLogViewerDetailsPage> deltaPanel() {
+        SelenideElement el = $x(".//div[@data-s-id='deltaPanel']").waitUntil(Condition.visible, MidPoint.TIMEOUT_DEFAULT_2_S);
         return new ScenePanel<>(this, el);
     }