Merge pull request #1874 from nordic-institute/XRDDEV-2457

feat: added couple of search field being focused checks to system-test; moved VuetifyHelper to common

src/central-server/admin-service/ui-system-test/build.gradle

@@ -1,6 +1,7 @@
 dependencies {
   intTestImplementation project(":central-server:openapi-model")
   intTestImplementation project(":common:common-util")
+  intTestImplementation project(":common:common-int-test")
   intTestImplementation("com.nortal.test:test-automation-core:${testAutomationFrameworkVersion}")
   intTestImplementation("com.nortal.test:test-automation-selenide:${testAutomationFrameworkVersion}") {
     exclude group: "org.slf4j", module: "*"

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/BaseUiStepDefs.java

@@ -30,11 +30,11 @@
 import com.nortal.test.core.report.TestReportService;
 import com.nortal.test.core.services.CucumberScenarioProvider;
 import com.nortal.test.core.services.ScenarioContext;
+import org.niis.xroad.common.test.ui.utils.SeleniumUtils;
 import org.niis.xroad.cs.test.ui.TargetHostUrlProvider;
 import org.niis.xroad.cs.test.ui.configuration.TestProperties;
 import org.niis.xroad.cs.test.ui.page.CommonPageObj;
 import org.niis.xroad.cs.test.ui.utils.ChromiumDevTools;
-import org.niis.xroad.cs.test.ui.utils.SeleniumUtils;
 import org.openqa.selenium.OutputType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/GlobalConfigurationStepDefs.java

@@ -54,7 +54,7 @@
 import static java.lang.ClassLoader.getSystemResource;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.given;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class GlobalConfigurationStepDefs extends BaseUiStepDefs {
     private static final DocumentBuilderFactory DBF = DocumentBuilderFactory.newInstance();

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/GlobalGroupDetailsStepDefs.java

@@ -34,7 +34,7 @@
 import static com.codeborne.selenide.Condition.enabled;
 import static com.codeborne.selenide.Condition.text;
 import static com.codeborne.selenide.Condition.visible;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class GlobalGroupDetailsStepDefs extends BaseUiStepDefs {
 

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/InitializationStepDefs.java

@@ -30,7 +30,7 @@
 import io.cucumber.java.en.Step;
 import org.niis.xroad.cs.test.ui.page.InitializationPageObj;
 
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class InitializationStepDefs extends BaseUiStepDefs {
     private final InitializationPageObj initializationPageObj = new InitializationPageObj();

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/LoginStepDefs.java

@@ -31,7 +31,7 @@
 import io.cucumber.java.en.Step;
 import org.niis.xroad.cs.test.ui.page.LoginPageObj;
 
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class LoginStepDefs extends BaseUiStepDefs {
     private final LoginPageObj loginPageObj = new LoginPageObj();

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/ManagementRequestsStepDefs.java

@@ -42,12 +42,13 @@
 import static com.codeborne.selenide.Condition.appear;
 import static com.codeborne.selenide.Condition.cssClass;
 import static com.codeborne.selenide.Condition.empty;
+import static com.codeborne.selenide.Condition.focused;
 import static com.codeborne.selenide.Condition.text;
 import static com.codeborne.selenide.Condition.visible;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vCheckbox;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 import static org.niis.xroad.cs.test.ui.constants.Constants.getSecurityServerId;
 import static org.niis.xroad.cs.test.ui.glue.BaseUiStepDefs.StepDataKey.MANAGEMENT_REQUEST_ID;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vCheckbox;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
 
 @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 public class ManagementRequestsStepDefs extends BaseUiStepDefs {
@@ -94,6 +95,7 @@ private String orderDirectionClass(final boolean descending) {
     @Step("the user clicks on search icon")
     public void clickOnSearchIcon() {
         managementRequestsPageObj.search().click();
+        vTextField(managementRequestsPageObj.search()).shouldBe(focused);
     }
 
     @Step("the user enters {} in the search field")

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/MemberDetailsStepDefs.java

@@ -30,7 +30,7 @@
 import org.niis.xroad.cs.test.ui.page.MemberDetailsPageObj;
 
 import static com.codeborne.selenide.Condition.visible;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class MemberDetailsStepDefs extends BaseUiStepDefs {
     private final MemberDetailsPageObj memberDetailsPageObj = new MemberDetailsPageObj();

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/MemberStepDefs.java

@@ -31,8 +31,9 @@
 
 import java.util.concurrent.TimeUnit;
 
+import static com.codeborne.selenide.Condition.focused;
 import static com.codeborne.selenide.Condition.visible;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class MemberStepDefs extends BaseUiStepDefs {
     private final MemberPageObj memberPageObj = new MemberPageObj();
@@ -72,6 +73,7 @@ public void memberIsNotListed(String memberName, String memberCode, String membe
     public void userSearchesForMemberUsing(String query) throws InterruptedException {
         memberPageObj.searchIcon().click();
         memberPageObj.searchInput().shouldBe(visible);
+        memberPageObj.searchInput().shouldBe(focused);
         memberPageObj.searchInput().setValue(query);
         TimeUnit.SECONDS.sleep(2); // wait for query to execute
     }

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/MemberSubsystemsStepDefs.java

@@ -29,7 +29,7 @@
 import io.cucumber.java.en.Step;
 import org.niis.xroad.cs.test.ui.page.MemberSubsystemsPageObj;
 
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class MemberSubsystemsStepDefs extends BaseUiStepDefs {
     private final MemberSubsystemsPageObj memberSubsystemsPageObj = new MemberSubsystemsPageObj();

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/SecurityServerAuthCertificatesStepDefs.java

@@ -45,7 +45,7 @@
 import static com.codeborne.selenide.Condition.enabled;
 import static com.codeborne.selenide.Condition.visible;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class SecurityServerAuthCertificatesStepDefs extends BaseUiStepDefs {
 

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/SecurityServerDetailsStepDefs.java

@@ -34,7 +34,7 @@
 import static com.codeborne.selenide.Condition.disabled;
 import static com.codeborne.selenide.Condition.enabled;
 import static com.codeborne.selenide.Condition.visible;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class SecurityServerDetailsStepDefs extends BaseUiStepDefs {
 

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/SettingsApiKeysStepDefs.java

@@ -35,7 +35,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vCheckbox;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vCheckbox;
 
 public class SettingsApiKeysStepDefs extends BaseUiStepDefs {
     private final SettingsApiKeysPageObj apiKeysPage = new SettingsApiKeysPageObj();

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/SettingsGlobalResourcesStepDefs.java

@@ -35,7 +35,7 @@
 
 import static com.codeborne.selenide.Condition.enabled;
 import static com.codeborne.selenide.Condition.visible;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class SettingsGlobalResourcesStepDefs extends BaseUiStepDefs {
     private final SettingsGlobalResourcesPageObj globalResourcesPage = new SettingsGlobalResourcesPageObj();

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/SystemSettingsManagementServicesStepDefs.java

@@ -34,7 +34,7 @@
 import static com.codeborne.selenide.Condition.empty;
 import static com.codeborne.selenide.Condition.text;
 import static com.codeborne.selenide.Condition.visible;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class SystemSettingsManagementServicesStepDefs extends BaseUiStepDefs {
 

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/SystemSettingsMemberClassesStepDefs.java

@@ -36,7 +36,7 @@
 import static com.codeborne.selenide.Condition.disabled;
 import static com.codeborne.selenide.Condition.enabled;
 import static com.codeborne.selenide.Condition.visible;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 /**
  * Settings -> System Settings -> Member classes page steps.

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/SystemSettingsParametersStepDefsObj.java

@@ -29,7 +29,7 @@
 import io.cucumber.java.en.Step;
 import org.niis.xroad.cs.test.ui.page.SystemSettingsParametersPageObj;
 
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class SystemSettingsParametersStepDefsObj extends BaseUiStepDefs {
     private final SystemSettingsParametersPageObj systemSettingsParametersPageObj = new SystemSettingsParametersPageObj();

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/TrustServicesOcspRespondersStepDefs.java

@@ -36,8 +36,8 @@
 import static com.codeborne.selenide.Condition.cssClass;
 import static com.codeborne.selenide.Condition.enabled;
 import static com.codeborne.selenide.Condition.visible;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 import static org.niis.xroad.cs.test.ui.constants.Constants.CN_SUBJECT_PREFIX;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
 
 public class TrustServicesOcspRespondersStepDefs extends BaseUiStepDefs {
     private final TrustServicesPageObj trustServicesPageObj = new TrustServicesPageObj();

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/TrustServicesStepDefs.java

@@ -41,9 +41,9 @@
 import static com.codeborne.selenide.Condition.cssClass;
 import static com.codeborne.selenide.Condition.text;
 import static com.codeborne.selenide.Condition.visible;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vCheckbox;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 import static org.niis.xroad.cs.test.ui.constants.Constants.CN_SUBJECT_PREFIX;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vCheckbox;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
 
 public class TrustServicesStepDefs extends BaseUiStepDefs {
     private static final String CERTIFICATE_PROFILE = "ee.ria.xroad.common.certificateprofile.impl.FiVRKCertificateProfileInfoProvider";

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/TrustServicesTimestampingServicesStepDefs.java

@@ -35,8 +35,8 @@
 import static com.codeborne.selenide.Condition.appear;
 import static com.codeborne.selenide.Condition.cssClass;
 import static com.codeborne.selenide.Condition.visible;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 import static org.niis.xroad.cs.test.ui.constants.Constants.CN_SUBJECT_PREFIX;
-import static org.niis.xroad.cs.test.ui.utils.VuetifyHelper.vTextField;
 
 public class TrustServicesTimestampingServicesStepDefs extends BaseUiStepDefs {
 

src/common/common-int-test/build.gradle

@@ -11,6 +11,9 @@ dependencies {
   api("com.nortal.test:test-automation-allure:${testAutomationFrameworkVersion}")
   api("com.nortal.test:test-automation-containers:${testAutomationFrameworkVersion}")
   api("com.nortal.test:test-automation-feign:$testAutomationFrameworkVersion")
+  api("com.nortal.test:test-automation-selenide:${testAutomationFrameworkVersion}") {
+    exclude group: "org.slf4j", module: "*"
+  }
   api("org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}")
   api("org.awaitility:awaitility:${awaitilityVersion}")
 }

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/utils/SeleniumUtils.java → src/common/common-int-test/src/main/java/org/niis/xroad/common/test/ui/utils/SeleniumUtils.java

@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-package org.niis.xroad.cs.test.ui.utils;
+package org.niis.xroad.common.test.ui.utils;
 
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;

src/security-server/system-test/src/intTest/java/org/niis/xroad/ss/test/ui/utils/VuetifyHelper.java → src/common/common-int-test/src/main/java/org/niis/xroad/common/test/ui/utils/VuetifyHelper.java

@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-package org.niis.xroad.ss.test.ui.utils;
+package org.niis.xroad.common.test.ui.utils;
 
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebElementCondition;
@@ -169,7 +169,7 @@ public Radio shouldBeUnChecked() {
 
         public void click() {
             controlElement.shouldBe(visible)
-                    .$x(".//input")
+                    .$x(INPUT_XPATH)
                     .click();
         }
     }

src/security-server/system-test/src/intTest/java/org/niis/xroad/ss/test/ui/glue/ApiKeysStepDefs.java

@@ -36,7 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.niis.xroad.ss.test.ui.utils.VuetifyHelper.vCheckbox;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vCheckbox;
 
 public class ApiKeysStepDefs extends BaseUiStepDefs {
 

src/security-server/system-test/src/intTest/java/org/niis/xroad/ss/test/ui/glue/AuthStepDefs.java

@@ -35,7 +35,7 @@
 
 import static com.codeborne.selenide.Condition.enabled;
 import static com.codeborne.selenide.Condition.visible;
-import static org.niis.xroad.ss.test.ui.utils.VuetifyHelper.vTextField;
+import static org.niis.xroad.common.test.ui.utils.VuetifyHelper.vTextField;
 
 public class AuthStepDefs extends BaseUiStepDefs {
     private final LoginPageObj loginPageObj = new LoginPageObj();