diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/CardAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/CardAssert.java index 32c0339b90..9eec1194a0 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/CardAssert.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/CardAssert.java @@ -9,6 +9,7 @@ import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; public class CardAssert extends UIAssert { + @JDIAction(value = "Assert that '{name}' has text '{0}'", isAssert = true) public CardAssert cardText(String value) { jdiAssert(element().getCardText().equals(value), Matchers.is(true), "ERROR MESSAGE IS REQUIRED"); @@ -29,21 +30,21 @@ public CardAssert srcImageAttribute(String value) { @JDIAction(value = "Assert that '{name}' has '{0}' buttons", isAssert = true) public CardAssert numberOfButtonsOnCard(int number) { - jdiAssert(element().getButtons().size() == number, Matchers.is(true), "ERROR MESSAGE IS REQUIRED"); + jdiAssert(element().actionButtons().size() == number, Matchers.is(true), "ERROR MESSAGE IS REQUIRED"); return this; } @JDIAction("Assert that '{name}' has align end actions") public CardAssert alignEndActions() { jdiAssert(element().actionsEndAlign(), Matchers.is(true), - "Card actions are in start align position"); + "Card actions are in start align position"); return this; } @JDIAction("Assert that '{name}' has align start actions") public CardAssert alignStartActions() { jdiAssert(element().actionsEndAlign(), Matchers.is(false), - "Card actions are in end align position"); + "Card actions are in end align position"); return this; } diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Card.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Card.java index c2c9165545..ad9ed40d99 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Card.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Card.java @@ -20,6 +20,7 @@ */ public class Card extends UIBaseElement { + @JDIAction("Get '{name}' header") public UIElement getHeader() { return this.find(".mat-mdc-card-header"); @@ -60,8 +61,8 @@ public UIElement getContent() { return this.find(".mat-mdc-card-content"); } - @JDIAction("Get '{name}' buttons") - public WebList getButtons() { + @JDIAction("Get '{name}' action buttons") + public WebList actionButtons() { return this.finds(".//mat-card-actions//button"); } @@ -72,12 +73,12 @@ public String getCardText() { @JDIAction("Get button with text '{text}'") public Button getButtonByText(String text) { - return new Button().setCore(Button.class, this.getButtons().get(text)); + return new Button().setCore(Button.class, this.actionButtons().get(text)); } @JDIAction("Get button with number '{number}'") public Button getButtonByNumber(int number) { - return new Button().setCore(Button.class, this.getButtons().get(number)); + return new Button().setCore(Button.class, this.actionButtons().get(number)); } @JDIAction("Get if {name} has align end actions") @@ -102,7 +103,7 @@ public CardImageSize cardImageSize() { return defineSize(image); } - public CardImageSize defineSize(UIElement image) { + private CardImageSize defineSize(UIElement image) { CardImageSize size = CardImageSize.UNKNOWN; if (image.hasClass("mat-mdc-card-xl-image")) { size = EXTRALARGE;