Skip to content

Commit b093619

Browse files
committed
#5463 fixing messages
1 parent 07450ee commit b093619

File tree

4 files changed

+14
-28
lines changed

4 files changed

+14
-28
lines changed

jdi-light-vuetify-tests/src/main/java/io/github/com/pages/ComboboxPage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.github.com.custom.AdvancedCombobox;
66

77
public class ComboboxPage extends VuetifyPage {
8+
// @todo #5463 Check if JDICombobox annotation, now the root value is not correct
89
@JDICombobox(
910
root = "#AutofocusCombobox div[role ='combobox']",
1011
listItems = "//ancestor::div[@id = 'app']//div[contains(@class, 'v-autocomplete__content')]//div[@class='v-list-item__title']")
@@ -99,7 +100,7 @@ public class ComboboxPage extends VuetifyPage {
99100
"//div[@class='v-list-item__title']")
100101
public static Combobox hideDetailsCombobox1;
101102
@JDICombobox(
102-
root = "#HideDetailsCombobox .col-6:nth-child(6) [role='combobox']",
103+
root = "#HideDetailsCombobox .col-6:nth-child(6) .v-select",
103104
listItems = "//ancestor::div[@id = 'app']//div[contains(@class, 'v-autocomplete__content')]" +
104105
"//div[@class='v-list-item__title']")
105106
public static Combobox errorMessageCombobox;

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Combobox.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@
4444
/**
4545
* To see example of Combobox web element please visit https://v2.vuetifyjs.com/en/components/combobox/
4646
*/
47-
47+
// @todo #5463 Refactor element, root element is element with class v-autocomplete
48+
// According to the docs The v-combobox component is a v-autocomplete that
49+
// allows the user to enter values that do not exist within the provided items.
50+
// May be it should inherit from autocomplete
4851
public class Combobox extends UIBaseElement<ComboboxAssert> implements ISetup, IsClearable, IsMultiple,
4952
IsReverse, IsSingleLine, IsFilled, IsLoading, IsReadOnly, HasMessages, IsDense, IsOutlined, IsSolo,
5053
IsFullWidth, HasColor, HasTheme, IsFlat, HasMeasurement, HasRounded, IsShaped, HasDetailsHidden, IsVuetifyInput {
@@ -56,7 +59,6 @@ public class Combobox extends UIBaseElement<ComboboxAssert> implements ISetup, I
5659
protected String inputLocator = "div input[type='text']";
5760
protected String expandLocator = "div .v-input__append-inner";
5861
protected String labelLocator = ".v-label";
59-
protected String messageLocator = "//following::div[@class = 'v-messages__message']";
6062
protected String counterLocator = "//following::div[contains(@class, 'v-counter')]";
6163
protected String errorMessageLocator = "//following::div[contains(@class, 'error--text')]"
6264
+ "//div[@class = 'v-messages__message']";
@@ -130,17 +132,6 @@ public Label label() {
130132
return new Label().setCore(Label.class, core().find(labelLocator));
131133
}
132134

133-
@Override
134-
public List<UIElement> messages() {
135-
return messages(messageLocator);
136-
}
137-
138-
@Override
139-
@JDIAction("Get '{name}' messages text")
140-
public List<String> messagesText() {
141-
return messagesText(messageLocator);
142-
}
143-
144135
@Override
145136
@JDIAction("Get '{name}' error messages")
146137
public List<String> errorMessagesText() {

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/TextField.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public class TextField extends UIBaseElement<TextFieldAssert>
4646
implements HasLabel, HasPlaceholder, IsInput, HasClick, HasColor, HasIcon, HasMeasurement, HasMessages,
4747
HasRounded, HasTheme, IsClearable, IsDense, IsFilled, IsFlat, IsLoading, IsOutlined, IsReadOnly, IsReverse,
4848
IsShaped, IsSingleLine, IsSolo, IsFullWidth, HasDetailsHidden {
49+
4950
private static final String DISABLED_CLASS = "v-input--is-disabled";
5051
private static final String FOCUSED_CLASS = "v-input--is-focused";
5152

@@ -59,7 +60,6 @@ public class TextField extends UIBaseElement<TextFieldAssert>
5960
private String prefixLocator = ".v-text-field__prefix";
6061
private String suffixLocator = ".v-text-field__suffix";
6162
private String detailsLocator = ".v-text-field__details";
62-
private String messageLocator = ".v-messages__message";
6363
private String loaderLocator = "div [role='progressbar']";
6464

6565
public TextField() {
@@ -100,17 +100,6 @@ public UIElement slot() {
100100
return core().find(slotLocator);
101101
}
102102

103-
/** Get the message element of the TextField.
104-
*
105-
* @return message as {@link UIElement}
106-
*/
107-
@Override
108-
@JDIAction("Get '{name}' message")
109-
public List<UIElement> messages() {
110-
return details().finds(messageLocator);
111-
}
112-
113-
// @todo #5320 Check this method, not clear why should we have external locator
114103
@Override
115104
@JDIAction("Get '{name}' messages text by locator '{0}'")
116105
public List<String> messagesText(String locator) {
@@ -313,6 +302,11 @@ public ProgressLinear loader() {
313302
return new ProgressLinear().setCore(ProgressLinear.class, core().find(loaderLocator));
314303
}
315304

305+
@Override
306+
public void click() {
307+
core().find(inputLocator).click();
308+
}
309+
316310
@Override
317311
public TextFieldAssert is() {
318312
return new TextFieldAssert().set(this);

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/interfaces/HasMessages.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ default int messagesCount() {
6666
*/
6767
@JDIAction("Check that '{name}' has error messages")
6868
default boolean hasErrorMessages() {
69-
return errorMessagesCount() > 0;
69+
return !errorMessagesText().isEmpty();
7070
}
7171

7272
/**
@@ -96,7 +96,7 @@ default int errorMessagesCount() {
9696
*/
9797
@JDIAction("Check that '{name}' has success messages")
9898
default boolean hasSuccessMessages() {
99-
return successMessagesCount() > 0;
99+
return !successMessagesText().isEmpty();
100100
}
101101

102102
/**

0 commit comments

Comments
 (0)