Get rid of asserts in helper classes #2295 (#2418)

* Get rid of asserts in helper classes #2295

* Fixed step description

* Deleted description of ConnectorCreateView

Co-authored-by: anezboretskiy <anezboretskiy@modeln.com>
Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java

@@ -26,7 +26,7 @@ public class MainPage {
     }
 
     @Step
-    public MainPage isOnPage() {
+    public MainPage waitUntilScreenReady() {
         $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
         $("input[name=switchRoundedDefault]").parent().$("span").shouldBe(Condition.visible);
         return this;

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java

@@ -34,8 +34,8 @@ public class ConnectorCreateView {
         return new ConnectorsView();
     }
 
-    @Step("Verify that page 'Create Connector' opened")
-    public ConnectorCreateView isOnConnectorCreatePage() {
+    @Step
+    public ConnectorCreateView waitUntilScreenReady() {
         nameField.shouldBe(Condition.visible);
         return this;
     }

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java

@@ -24,7 +24,7 @@ public class ConnectorsList {
     }
 
     @Step
-    public ConnectorsList isOnPage() {
+    public ConnectorsList waitUntilScreenReady() {
         $(By.xpath("//h1[text()='Connectors']")).shouldBe(Condition.visible);
         return this;
     }

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java

@@ -12,7 +12,7 @@ import static com.codeborne.selenide.Selenide.$x;
 public class SchemaView {
 
     @Step
-    public SchemaView isOnSchemaViewPage() {
+    public SchemaView waitUntilScreenReady() {
         $("div#schema").shouldBe(Condition.visible);
         return this;
     }

kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java

@@ -29,7 +29,7 @@ public class TopicView {
     }
 
     @Step
-    public TopicView isOnTopicViewPage() {
+    public TopicView waitUntilScreenReady() {
         $(By.linkText("Overview")).shouldBe(Condition.visible);
         return this;
     }

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

@@ -25,7 +25,7 @@ public class TopicsList {
     }
 
     @Step
-    public TopicsList isOnPage() {
+    public TopicsList waitUntilScreenReady() {
         $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
         $(By.xpath("//h1[text()='All Topics']")).shouldBe(Condition.visible);
         return this;

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

@@ -16,7 +16,7 @@ public class SmokeTests extends BaseTest {
     @DisplayName("main page should load")
     void mainPageLoads() {
         pages.open()
-                .isOnPage();
+                .waitUntilScreenReady();
         compareScreenshots("main");
     }
 

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java

@@ -70,14 +70,14 @@ public class ConnectorsTests extends BaseTest {
     @Test
     public void createConnector() {
         pages.openConnectorsList(LOCAL_CLUSTER)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .clickCreateConnectorButton()
-                .isOnConnectorCreatePage()
+                .waitUntilScreenReady()
                 .setConnectorConfig(
                         SINK_CONNECTOR,
                         FileUtils.getResourceAsString("config_for_create_connector.json"));
         pages.openConnectorsList(LOCAL_CLUSTER)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR);
     }
 
@@ -89,7 +89,7 @@ public class ConnectorsTests extends BaseTest {
     @Test
     public void updateConnector() {
         pages.openConnectorsList(LOCAL_CLUSTER)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_UPDATE);
         pages.connectorsView.connectorIsVisibleOnOverview();
         pages.connectorsView.openEditConfig()
@@ -106,7 +106,7 @@ public class ConnectorsTests extends BaseTest {
     @Test
     public void deleteConnector() {
         pages.openConnectorsList(LOCAL_CLUSTER)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_DELETE);
         pages.connectorsView.clickDeleteButton();
         pages.openConnectorsList(LOCAL_CLUSTER)

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java

@@ -71,7 +71,7 @@ public class SchemasTests extends BaseTest {
                 .setSchemaField(readFileAsString(PATH_AVRO_VALUE))
                 .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.AVRO)
                 .clickSubmit()
-                .isOnSchemaViewPage();
+                .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.isSchemaVisible(SCHEMA_AVRO_CREATE);
@@ -88,12 +88,12 @@ public class SchemasTests extends BaseTest {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_AVRO_API_UPDATE)
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .openEditSchema()
                 .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(readFileAsString(PATH_AVRO_FOR_UPDATE))
                 .clickSubmit()
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .isCompatibility(CompatibilityLevel.CompatibilityEnum.NONE);
     }
 
@@ -108,7 +108,7 @@ public class SchemasTests extends BaseTest {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_AVRO_API)
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .removeSchema()
                 .isNotVisible(SCHEMA_AVRO_API);
     }
@@ -128,7 +128,7 @@ public class SchemasTests extends BaseTest {
                 .setSchemaField(readFileAsString(PATH_JSON_VALUE))
                 .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.JSON)
                 .clickSubmit()
-                .isOnSchemaViewPage();
+                .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.isSchemaVisible(SCHEMA_JSON_CREATE);
@@ -145,7 +145,7 @@ public class SchemasTests extends BaseTest {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_JSON_API)
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .removeSchema()
                 .isNotVisible(SCHEMA_JSON_API);
     }
@@ -165,7 +165,7 @@ public class SchemasTests extends BaseTest {
                 .setSchemaField(readFileAsString(PATH_PROTOBUF_VALUE))
                 .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.PROTOBUF)
                 .clickSubmit()
-                .isOnSchemaViewPage();
+                .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.isSchemaVisible(SCHEMA_PROTOBUF_CREATE);
@@ -182,7 +182,7 @@ public class SchemasTests extends BaseTest {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_PROTOBUF_API)
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .removeSchema()
                 .isNotVisible(SCHEMA_PROTOBUF_API);
     }

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

@@ -55,7 +55,7 @@ public class TopicTests extends BaseTest {
         pages.topicsList.pressCreateNewTopic()
                 .setTopicName(NEW_TOPIC)
                 .sendData()
-                .isOnTopicViewPage();
+                .waitUntilScreenReady();
         pages.open()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
                 .topicIsVisible(NEW_TOPIC);
@@ -74,9 +74,9 @@ public class TopicTests extends BaseTest {
     @Test
     public void updateTopic() {
         pages.openTopicsList(SECOND_LOCAL)
-                .isOnPage();
+                .waitUntilScreenReady();
         pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
-                .isOnTopicViewPage()
+                .waitUntilScreenReady()
                 .openEditSettings()
                 .selectCleanupPolicy(COMPACT_POLICY_VALUE)
                 .setMinInsyncReplicas(10)
@@ -84,10 +84,10 @@ public class TopicTests extends BaseTest {
                 .setMaxSizeOnDiskInGB(UPDATED_MAX_SIZE_ON_DISK)
                 .setMaxMessageBytes(UPDATED_MAX_MESSAGE_BYTES)
                 .sendData()
-                .isOnTopicViewPage();
+                .waitUntilScreenReady();
 
         pages.openTopicsList(SECOND_LOCAL)
-                .isOnPage();
+                .waitUntilScreenReady();
         pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
                 .openEditSettings()
                 // Assertions
@@ -105,11 +105,11 @@ public class TopicTests extends BaseTest {
     @Test
     public void deleteTopic() {
         pages.openTopicsList(SECOND_LOCAL)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .openTopic(TOPIC_TO_DELETE)
-                .isOnTopicViewPage()
+                .waitUntilScreenReady()
                 .deleteTopic()
-                .isOnPage()
+                .waitUntilScreenReady()
                 .isTopicNotVisible(TOPIC_TO_DELETE);
     }
 
@@ -121,9 +121,9 @@ public class TopicTests extends BaseTest {
     @Test
     void produceMessage() {
         pages.openTopicsList(SECOND_LOCAL)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .openTopic(TOPIC_TO_UPDATE)
-                .isOnTopicViewPage()
+                .waitUntilScreenReady()
                 .openTopicMenu(TopicView.TopicMenu.MESSAGES)
                 .clickOnButton("Produce Message")
                 .setContentFiled(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE))