Skip to content

Commit dc2bd7d

Browse files
Andries SmitAndries-Smit
authored andcommitted
Review improve e2e
1 parent 62634fa commit dc2bd7d

File tree

4 files changed

+54
-15
lines changed

4 files changed

+54
-15
lines changed

tests/e2e/Pagination/Pagination.spec.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import page from "./pages/home.page";
22
import pagesize from "./pages/pageSize.page";
3+
import paginationCustom from "./pages/paginationCustom.page";
34

45
const testValueOne = "Color 1";
56
const testValueFive = "Color 5";
@@ -78,13 +79,13 @@ describe("Pagination", () => {
7879

7980
it("when custom button is clicked list view should show item on the custom page ", () => {
8081

81-
page.openCustom();
82+
paginationCustom.open();
8283

83-
page.customButtonTwo.waitForDisplayed(120000);
84-
page.customButtonTwo.click();
85-
page.listView4ThirdItem.waitForDisplayed();
84+
paginationCustom.customButtonTwo.waitForDisplayed(120000);
85+
paginationCustom.customButtonTwo.click();
86+
paginationCustom.listView4ThirdItem.waitForDisplayed();
8687

87-
const thirdItemValue = page.listView4ThirdItem.getHTML();
88+
const thirdItemValue = paginationCustom.listView4ThirdItem.getHTML();
8889
expect(thirdItemValue).toContain("Color P 3");
8990
});
9091

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
class PaginationCustom {
2+
public get paginationOne() { return $(".mx-name-pagination9"); }
3+
4+
public get listViewOne() { return $(".mx-name-listView1"); }
5+
6+
public get nextButton() { return $(".mx-name-pagination9 > div > button.btn.mx-button.mx-name-paging-next"); }
7+
8+
public get firstButton() { return $(".mx-name-pagination9 > div > button.btn.mx-button.mx-name-paging-first"); }
9+
10+
public get previousButton() { return $(".mx-name-pagination9 > div > button.btn.mx-button.mx-name-paging-previous"); }
11+
12+
public get customButtonTwo() { return $("#mxui_widget_ReactCustomWidgetWrapper_0 > div > ul > li:nth-child(2)"); }
13+
14+
public get lastButton() { return $(".mx-name-pagination9 > div > button.btn.mx-button.mx-name-paging-last"); }
15+
16+
public get listViewFirstItem() { return $(".mx-name-listView1 > ul > li.mx-listview-item.mx-name-index-0 > div > div > span"); }
17+
18+
public get listViewThirdItem() { return $(".mx-name-listView1 > ul > li.mx-listview-item.mx-name-index-2 > div > div > span"); }
19+
20+
public get listView4ThirdItem() { return $("ul > li.mx-listview-item.mx-name-index-2"); }
21+
22+
public get listViewFifthItem() { return $(".mx-name-listView1 > ul > li.mx-listview-item.mx-name-index-4 > div > div > span"); }
23+
24+
public get listViewSeventhItem() { return $(".mx-name-listView1 > ul > li.mx-listview-item.mx-name-index-6 > div > div > span"); }
25+
26+
public get listViewNinethItem() { return $(".mx-name-listView1 > ul > li.mx-listview-item.mx-name-index-8 > div > div > span"); }
27+
28+
public get listViewLastItem() { return $(".mx-name-listView1 > ul > li.mx-listview-item.mx-name-index-18 > div > div > span"); }
29+
30+
public open(): void {
31+
browser.url("/p/pagination-custom");
32+
}
33+
}
34+
const page = new PaginationCustom();
35+
export default page;

tests/e2e/TextSearch/TextBoxSearch.spec.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,26 @@ describe("Text box search", () => {
66
it("when query is entered in the search input the list view should be filtered", () => {
77
page.open();
88
page.searchInput.waitForDisplayed();
9+
910
expect(page.listViewListItems.length).toBe(5);
1011
page.searchInput.click();
1112
page.searchInput.setValue(testValue);
12-
browser.pause(1000);
13+
14+
browser.waitUntil(() => {
15+
return page.listViewListItems.length === 1;
16+
}, 5000, "wait for single item");
1317
expect(page.listViewListItems.length).toBe(1);
1418
});
1519

1620
it("when query is entered in the search input and clear button clicked the list view should be filtered with new query", () => {
1721
page.open();
1822
page.searchInput.waitForDisplayed();
23+
24+
browser.waitUntil(() => {
25+
return page.listViewListItems.length === 5;
26+
}, 5000, "wait for initial items");
27+
expect(page.listViewListItems.length).toBe(5);
28+
1929
page.searchInput.click();
2030
page.searchInput.setValue(testValue);
2131

@@ -24,18 +34,11 @@ describe("Text box search", () => {
2434
}, 5000, "wait for single item");
2535
expect(page.listViewListItems.length).toBe(1);
2636

27-
page.searchButton.click();
37+
page.searchClearButton.click();
2838

2939
browser.waitUntil(() => {
3040
return page.listViewListItems.length === 5;
3141
}, 5000, "wait for clear search");
3242
expect(page.listViewListItems.length).toBe(5);
33-
34-
page.searchInput.setValue("en");
35-
36-
browser.waitUntil(() => {
37-
return page.listViewListItems.length === 4;
38-
}, 5000, "wait for search items");
39-
expect(page.listViewListItems.length).toBe(4);
4043
});
4144
});

tests/e2e/TextSearch/pages/home.page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class HomePage {
22
public get searchInput() { return $(".mx-name-text_boxSearch1 input"); }
3-
public get searchButton() { return $(".mx-name-text_boxSearch1 button"); }
3+
public get searchClearButton() { return $(".mx-name-text_boxSearch1 button"); }
44
public get listViewList() { return $(".mx-name-listView3 .mx-listview-list"); }
55
public get listViewListItems() { return $$(".mx-name-listView3 .mx-listview-item"); }
66
public open(): void {

0 commit comments

Comments
 (0)