626: get rid of reloadPage method and provide parameters instead of path + method rename

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java

@@ -28,12 +28,8 @@ public class Pages {
         return goTo(TopicsList.path).topicsList;
     }
 
-    public TopicViewPage openTopicViewPage(String path) {
-        return goTo(path).topicViewPage;
+    public TopicView openTopicView(String clusterName, String topicName) {
+        return goTo(TopicView.path.formatted(clusterName, topicName)).topicView;
     }
 
-    public Pages reloadPage() {
-        Selenide.refresh();
-        return this;
-    }
 }

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicsList.java

@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.pages;
 
 import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.helpers.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.SneakyThrows;
 import org.openqa.selenium.By;
@@ -19,8 +20,9 @@ public class TopicsList {
     }
 
     @SneakyThrows
-    public TopicsListPage openTopic(String topicName) {
-        refreshUntil(By.xpath("//div[contains(@class,'section')]//table//a[text()='%s']".formatted(topicName)));
+    public TopicsList openTopic(String topicName) {
+        WaitUtils.refreshUntil(By.xpath("//div[contains(@class,'section')]//table//a[text()='%s']"
+                .formatted(topicName)));
         $(By.xpath("//div[contains(@class,'section')]//table//a[text()='%s']".formatted(topicName)))
                 .click();
         return this;

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/topics/TopicTests.java

@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.topics;
 
+import com.codeborne.selenide.Selenide;
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.helpers.WaitUtils;
@@ -10,7 +11,6 @@ import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import static com.provectus.kafka.ui.helpers.Utils.waitForSelectedValue;
 
 
 public class TopicTests extends BaseTest {
@@ -56,21 +56,19 @@ public class TopicTests extends BaseTest {
     @SneakyThrows
     @DisplayName("should update a topic")
     @Test
-    void updateTopic(){
-        final String path = "ui/clusters/" + SECOND_LOCAL + "/topics/" + UPDATE_TOPIC;
-
-        pages.openTopicsListPage()
-                .shouldBeOnPage()
+    void updateTopic() {
+        pages.openTopicsList()
+                .isOnPage()
                 .openTopic(UPDATE_TOPIC);
-        pages.openTopicViewPage(path)
+        pages.openTopicView(SECOND_LOCAL, UPDATE_TOPIC)
                 .openEditSettings()
                 .changeCleanupPolicy(COMPACT_POLICY_VALUE)
                 .changeTimeToRetainValue(UPDATED_TIME_TO_RETAIN_VALUE)
                 .changeMaxSizeOnDisk(UPDATED_MAX_SIZE_ON_DISK)
                 .changeMaxMessageBytes(UPDATED_MAX_MESSAGE_BYTES)
                 .submitSettingChanges();
-        pages.reloadPage();
-        TopicViewPage topicViewPage = pages.openTopicViewPage(path)
+        Selenide.refresh();
+        TopicView topicView = pages.openTopicView(SECOND_LOCAL, UPDATE_TOPIC)
                 .openEditSettings();
 
         WaitUtils.waitForSelectedValue(topicView.getCleanupPolicy(), COMPACT_POLICY_VALUE);
@@ -85,13 +83,12 @@ public class TopicTests extends BaseTest {
     @Test
     @Disabled
     void deleteTopic(){
-        final String path = "ui/clusters/" + SECOND_LOCAL + "/topics/" + DELETE_TOPIC;
 
-        pages.openTopicsListPage()
-                .shouldBeOnPage()
-                .openTopic(DELETE_TOPIC);
-        pages.openTopicViewPage(path).clickDeleteTopicButton();
-        pages.openTopicsListPage().shouldBeDeleted(DELETE_TOPIC);
+        pages.openTopicsList()
+                .isOnPage()
+                .openTopic(TOPIC_TO_DELETE);
+        pages.openTopicView(SECOND_LOCAL, TOPIC_TO_DELETE).clickDeleteTopicButton();
+        pages.openTopicsList().isDeleted(TOPIC_TO_DELETE);
     }
 
 }