5076 Fix Autocomplete tests

jdi-testing · Sep 21, 2023 · 856dc27 · 856dc27
1 parent 1d0a32f
commit 856dc27
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
@@ -1,11 +1,8 @@
 package io.github.com;
 
 import com.epam.jdi.light.elements.pageobjects.annotations.JSite;
-import com.epam.jdi.light.elements.pageobjects.annotations.Url;;
-import io.github.com.pages.AngularPage;
-import io.github.com.pages.ButtonsPage;
-import io.github.com.pages.ProgressBarPage;
-import io.github.com.pages.ProgressSpinnerPage;
+import com.epam.jdi.light.elements.pageobjects.annotations.Url;
+import io.github.com.pages.*;
 
 @JSite("https://jdi-testing.github.io/jdi-light/angular-page/#/")
 public class StaticSite {

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AutocompletePage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AutocompletePage.java
@@ -18,6 +18,9 @@ public class AutocompletePage extends NewAngularPage {
     @UI("#autocomplete-display-value-input")
     public AutoComplete displayValueAutocomplete;
 
+    @UI("label[for='autocomplete-display-value-input'] > mat-label")
+    public AutoComplete displayValueLabelAutocomplete;
+
     @UI("#autocomplete-filter-input")
     public AutoComplete filterAutocomplete;
 

diff --git a/...-tests/src/test/java/io/github/epam/angular/tests/elements/complex/AutocompleteTests.java b/...-tests/src/test/java/io/github/epam/angular/tests/elements/complex/AutocompleteTests.java
@@ -2,7 +2,6 @@
 
 import io.github.epam.TestsInit;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;
@@ -11,9 +10,8 @@
 import java.util.Map;
 
 import static com.jdiai.tools.Timer.waitCondition;
-import static io.github.com.StaticSite.*;
+import static io.github.com.StaticSite.autocompletePage;
 
-// TODO Move to the new page
 public class AutocompleteTests extends TestsInit {
 
     @BeforeClass
@@ -66,7 +64,7 @@ public void verifySimpleAutocomplete() {
 
     @Test
     public void verifyDisplayValueAutocomplete() {
-        autocompletePage.displayValueAutocomplete.has().displayValue("Assignee");
+        autocompletePage.displayValueLabelAutocomplete.has().text("Assignee");
         autocompletePage.displayValueAutocomplete.has().placeholder("");
         autocompletePage.displayValueAutocomplete.is().enabled();
         autocompletePage.displayValueAutocomplete.is().notMandatory();

diff --git a/jdi-light-angular-tests/src/test/resources/common.properties b/jdi-light-angular-tests/src/test/resources/common.properties
@@ -1 +1 @@
-#arguments=--headless
+arguments=--headless
diff --git a/jdi-light-angular-tests/src/test/resources/test.properties b/jdi-light-angular-tests/src/test/resources/test.properties
@@ -23,4 +23,4 @@ log.level=INFO
 #remote.type=sauce | browserstack
 #driver.remote.url=http://localhost:4444/wd/hub
 screenshot.strategy=on failure|on assert
-headless=false
+headless=true
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/AutoCompleteAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/AutoCompleteAssert.java
@@ -29,7 +29,7 @@ public AutoCompleteAssert collapsed() {
     @JDIAction("Assert that '{name}' text {0}")
     @Override
     public AutoCompleteAssert text(String expected) {
-        jdiAssert(element().getValue(), Matchers.is(expected));
+        jdiAssert(element().getText(), Matchers.is(expected));
         return this;
     }
 
@@ -79,7 +79,7 @@ public AutoCompleteAssert valid() {
 
     @JDIAction("Assert that '{name}' has display value")
     public AutoCompleteAssert displayValue(String expected) {
-        jdiAssert(element().displayValue(), Matchers.is(expected));
+        jdiAssert(element().getValue(), Matchers.is(expected));
         return this;
     }
 

diff --git a/...light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/AutoComplete.java b/...light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/AutoComplete.java
@@ -26,7 +26,7 @@
 public class AutoComplete extends UIBaseElement<AutoCompleteAssert> implements HasLabel, SetValue, HasPlaceholder, IsInput, IsText {
 
     private String optionsCss = "mat-option";
-    private String optionsGroupsCss = "mat-optgroup>label";
+    private String optionsGroupsCss = "mat-optgroup > span";
     private String optionsGroupsAndValuesCss = "mat-optgroup";
     private String displayValueCss = "mat-label";
     private String autocompleteAttrPrefix = "_ngcontent-";
@@ -80,7 +80,7 @@ public Boolean isOptionHighlighted(String value) {
         WebList values = getOptions(optionsCss);
         UIElement element = values.get(value);
         String selected = element.core().getAttribute("class");
-        return selected.contains("mat-active");
+        return selected.contains("mat-mdc-option-active");
     }
 
     public void setValue(String inputValue, String selectValue) {
@@ -215,7 +215,7 @@ public Boolean isMandatory() {
 
     @JDIAction("Is '{name} invalidated")
     public Boolean isInvalidated() {
-        return "true".equals(core().getAttribute("aria-invalid"));
+        return core().getAttribute("class").contains("ng-invalid");
     }
 
     @JDIAction("Is '{name} disabled")