Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4952 + 4964: Angular grid list class implementation and refactoring tests #5085

Open
wants to merge 37 commits into
base: angular_rework_development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a18ae08
add grid list implementation and refactor tests
b14ckster Jun 27, 2023
95a1554
add grid list implementation and add tests
b14ckster Jun 28, 2023
e32700e
refactor code
b14ckster Jul 10, 2023
eac88c8
refactor code and implement using new page
b14ckster Jul 12, 2023
854d3a2
implement grid list class and refactor tests
b14ckster Jul 13, 2023
4478d36
refactor imports and enum
b14ckster Jul 14, 2023
260fab6
refactor unit tests
b14ckster Jul 14, 2023
dc4d9c9
refactor tests and Element Object
b14ckster Sep 26, 2023
e407e9b
hot fix Colors
b14ckster Sep 26, 2023
dd6abf5
grid list tests refactoring
b14ckster Sep 26, 2023
f2f26c5
refactor asserts
b14ckster Oct 13, 2023
b2d62cd
4952-64-refactoringGridListAfterRebase
MayaElf Oct 18, 2023
b2f8717
4952-64-refactoringGridListAfterRebase
MayaElf Oct 18, 2023
5be7585
Merge branch 'angular_rework_development' into angular_grid_list_clas…
AlinaLysenko Nov 29, 2023
32ebfa6
Merge branch 'angular_rework_development' into angular_grid_list_clas…
AlinaLysenko Dec 5, 2023
d1f6926
gridTile implemented with header, footer and avatar
AlinaLysenko Dec 11, 2023
13595b0
changed cell to tile in naming
AlinaLysenko Dec 11, 2023
fe09856
Merge branch 'angular_rework_development' into angular_grid_list_clas…
AlinaLysenko Dec 21, 2023
c42148a
fixed comments
AlinaLysenko Dec 22, 2023
fa15251
removed unused imports
AlinaLysenko Dec 22, 2023
34b2f5e
Merge branch 'angular_rework_development' into angular_grid_list_clas…
AlinaLysenko Dec 22, 2023
c20c5d8
added background colors
AlinaLysenko Dec 26, 2023
763b7b9
text method updated
AlinaLysenko Jan 4, 2024
473ff98
Merge branch 'angular_rework_development' into angular_grid_list_clas…
AlinaLysenko Jan 4, 2024
7125245
option to implement extending UIListBase
AlinaLysenko Jan 4, 2024
1aa6a2d
removed creating variables for actual values for asserts
AlinaLysenko Jan 5, 2024
42db430
added getting footer and header as uiElement. No extra asserts added
AlinaLysenko Jan 5, 2024
f219d10
fixed text colors and added names for tiles
AlinaLysenko Jan 16, 2024
2aab439
Merge branch 'angular_rework_development' into angular_grid_list_clas…
AlinaLysenko Jan 18, 2024
7720301
added get content option, removed "in pixels" and changed tileByIngex…
AlinaLysenko Feb 2, 2024
bb6f030
removed content option, and separated getting tiles in stream and list
AlinaLysenko Feb 2, 2024
b67c3ba
added assertions for grid list and test examples for it
AlinaLysenko Feb 8, 2024
1f0dd27
removed methods itemsWithTexts and textsInItems
AlinaLysenko Feb 8, 2024
9eb0550
Update jdi-light-angular/src/main/java/com/epam/jdi/light/angular/ass…
vklonin Feb 9, 2024
eae91ea
Update jdi-light-angular-tests/src/test/java/io/github/epam/angular/t…
vklonin Feb 9, 2024
969e802
added custom tile, fixed empty matcher, removed mismatch message
AlinaLysenko Feb 13, 2024
50a42ae
Merge remote-tracking branch 'origin/angular_grid_list_class_implemen…
AlinaLysenko Feb 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
vklonin marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ public void dynamicGridListTest() {
.and().colspan(1)
.and().rowspan(2);

dynamicGridList.tileByIndex(2).content().find(".avatar-img").is()
.attr("src","https://material.angular.io/assets/img/examples/shiba2.jpg");

dynamicGridList.tileByIndex(3)
.is().colspan(1)
.and().rowspan(1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.epam.jdi.light.common.JDIAction;
import com.epam.jdi.light.elements.base.UIListBase;

import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
Expand All @@ -23,14 +22,17 @@ public String rowHeight() {
return core().getAttribute("rowheight");
}

@JDIAction(value = "Get '{name}' gutter size in pixels")
@JDIAction(value = "Get '{name}' gutter size")
public String gutterSize() {
return core().getAttribute("guttersize");
}

@JDIAction(value = "Get '{name}' tile by index '{0}' (1 based index)")
public GridTile tileByIndex(int index) {
vklonin marked this conversation as resolved.
Show resolved Hide resolved
return getTiles().collect(Collectors.toList()).get(index - 1);
return getTiles()
.skip(index - 1)
.findFirst()
.orElseThrow(() -> new IllegalArgumentException("No tile at index " + index));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ public AngularColors footerAngularBackgroundColor() {
return AngularColors.fromColor(footerBackgroundColor());
}

@JDIAction("Get '{name}' content")
vklonin marked this conversation as resolved.
Show resolved Hide resolved
public UIElement content() {
return core();
}

@JDIAction("Get '{name}' header text")
public String headerText() {
return core().find(HEADER_LOCATOR).text();
Expand Down