فهرست منبع

upd navigateToKsqlDbAndExecuteRequest

VladSenyuta 2 سال پیش
والد
کامیت
68e66bbdb1

+ 5 - 1
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java

@@ -37,9 +37,13 @@ public abstract class BasePage extends WebUtils {
   protected String pageTitleFromHeader = "//h1[text()='%s']";
   protected String pagePathFromHeader = "//a[text()='%s']/../h1";
 
+  protected boolean isSpinnerVisible(int... timeoutInSeconds) {
+    return isVisible(loadingSpinner, timeoutInSeconds);
+  }
+
   protected void waitUntilSpinnerDisappear(int... timeoutInSeconds) {
     log.debug("\nwaitUntilSpinnerDisappear");
-    if (isVisible(loadingSpinner, timeoutInSeconds)) {
+    if (isSpinnerVisible(timeoutInSeconds)) {
       loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(60));
     }
   }

+ 2 - 2
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java

@@ -3,6 +3,7 @@ package com.provectus.kafka.ui.pages.ksqldb;
 import static com.codeborne.selenide.Condition.visible;
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
 
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
@@ -12,7 +13,6 @@ import com.provectus.kafka.ui.pages.ksqldb.enums.KsqlMenuTabs;
 import io.qameta.allure.Step;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.openqa.selenium.By;
 
@@ -24,7 +24,7 @@ public class KsqlDbList extends BasePage {
   @Step
   public KsqlDbList waitUntilScreenReady() {
     waitUntilSpinnerDisappear();
-    Arrays.asList(tablesTab, streamsTab).forEach(tab -> tab.shouldBe(Condition.visible));
+    getPageTitleFromHeader(KSQL_DB).shouldBe(Condition.visible);
     return this;
   }
 

+ 1 - 2
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java

@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class KsqlQueryForm extends BasePage {
-  protected SelenideElement pageTitle = $x("//h1[text()='Query']");
   protected SelenideElement clearBtn = $x("//div/button[text()='Clear']");
   protected SelenideElement executeBtn = $x("//div/button[text()='Execute']");
   protected SelenideElement stopQueryBtn = $x("//div/button[text()='Stop query']");
@@ -30,7 +29,7 @@ public class KsqlQueryForm extends BasePage {
   @Step
   public KsqlQueryForm waitUntilScreenReady() {
     waitUntilSpinnerDisappear();
-    pageTitle.shouldBe(Condition.visible);
+    executeBtn.shouldBe(Condition.visible);
     return this;
   }
 

+ 4 - 11
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java

@@ -41,38 +41,31 @@ public class SmokeBacklog extends BaseManualTest {
   public void testCaseD() {
   }
 
-  @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = KSQL_DB_SUITE_ID)
-  @QaseId(284)
-  @Test
-  public void testCaseE() {
-  }
-
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(331)
   @Test
-  public void testCaseF() {
+  public void testCaseE() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(332)
   @Test
-  public void testCaseG() {
+  public void testCaseF() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(335)
   @Test
-  public void testCaseH() {
+  public void testCaseG() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(336)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 }