Skip to content

Commit 930316e

Browse files
astandrikastandrik
committed
fix: review fixe
1 parent 480e023 commit 930316e

File tree

5 files changed

+160
-121
lines changed

5 files changed

+160
-121
lines changed

‎tests/suites/memoryViewer/memoryViewer.test.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {expect, test} from '@playwright/test';
22

33
import {NodesPage} from '../nodes/NodesPage';
4-
import {PaginatedTable} from '../paginatedTable/paginatedTable';
4+
import {ClusterNodesTable} from '../paginatedTable/paginatedTable';
55

66
import {MemoryViewer} from './MemoryViewer';
77

@@ -11,13 +11,14 @@ test.describe('Memory Viewer Widget', () => {
1111
const memoryViewer = new MemoryViewer(page);
1212
await nodesPage.goto();
1313

14-
const paginatedTable = new PaginatedTable(page);
14+
const paginatedTable = new ClusterNodesTable(page);
1515
await paginatedTable.waitForTableVisible();
1616
await paginatedTable.waitForTableData();
1717
if (!(await memoryViewer.isVisible())) {
18-
await paginatedTable.openColumnSetup();
19-
await paginatedTable.setColumnChecked('Memory');
20-
await paginatedTable.applyColumnVisibility();
18+
const controls = paginatedTable.getControls();
19+
await controls.openColumnSetup();
20+
await controls.setColumnChecked('Memory');
21+
await controls.applyColumnVisibility();
2122
}
2223
await memoryViewer.waitForVisible();
2324
});

‎tests/suites/nodes/nodes.test.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {expect, test} from '@playwright/test';
22

33
import {backend} from '../../utils/constants';
44
import {NodesPage} from '../nodes/NodesPage';
5-
import {PaginatedTable} from '../paginatedTable/paginatedTable';
5+
import {ClusterNodesTable} from '../paginatedTable/paginatedTable';
66

77
test.describe('Test Nodes page', async () => {
88
test('Nodes page is OK', async ({page}) => {
@@ -30,7 +30,7 @@ test.describe('Test Nodes Paginated Table', async () => {
3030
});
3131

3232
test('Table loads and displays data', async ({page}) => {
33-
const paginatedTable = new PaginatedTable(page);
33+
const paginatedTable = new ClusterNodesTable(page);
3434

3535
await paginatedTable.waitForTableToLoad();
3636
await paginatedTable.waitForTableData();
@@ -40,13 +40,13 @@ test.describe('Test Nodes Paginated Table', async () => {
4040
});
4141

4242
test('Search by hostname filters the table', async ({page}) => {
43-
const paginatedTable = new PaginatedTable(page);
43+
const paginatedTable = new ClusterNodesTable(page);
4444

4545
await paginatedTable.waitForTableToLoad();
4646
await paginatedTable.waitForTableData();
4747

4848
const initialRowCount = await paginatedTable.getRowCount();
49-
await paginatedTable.search('localhost');
49+
await paginatedTable.getControls().search('localhost');
5050

5151
await page.waitForTimeout(1000); // Wait for the table to update
5252

@@ -56,7 +56,7 @@ test.describe('Test Nodes Paginated Table', async () => {
5656

5757
test('Table groups displayed correctly if group by option is selected', async ({page}) => {
5858
const nodesPage = new NodesPage(page);
59-
const nodesTable = new PaginatedTable(page);
59+
const nodesTable = new ClusterNodesTable(page);
6060

6161
await nodesTable.waitForTableToLoad();
6262
await nodesTable.waitForTableData();
@@ -74,19 +74,19 @@ test.describe('Test Nodes Paginated Table', async () => {
7474
});
7575

7676
test('Node count is displayed correctly', async ({page}) => {
77-
const paginatedTable = new PaginatedTable(page);
77+
const paginatedTable = new ClusterNodesTable(page);
7878

7979
await paginatedTable.waitForTableToLoad();
8080
await paginatedTable.waitForTableData();
8181

82-
const nodeCount = await paginatedTable.getCount();
82+
const nodeCount = await paginatedTable.getControls().getCount();
8383
const rowCount = await paginatedTable.getRowCount();
8484

8585
expect(nodeCount).toBe(rowCount);
8686
});
8787

8888
test('Uptime values are displayed in correct format', async ({page}) => {
89-
const paginatedTable = new PaginatedTable(page);
89+
const paginatedTable = new ClusterNodesTable(page);
9090

9191
await paginatedTable.waitForTableToLoad();
9292
await paginatedTable.waitForTableData();
@@ -99,27 +99,27 @@ test.describe('Test Nodes Paginated Table', async () => {
9999
});
100100

101101
test('Refresh button updates the table data', async ({page}) => {
102-
const paginatedTable = new PaginatedTable(page);
102+
const paginatedTable = new ClusterNodesTable(page);
103103

104104
await paginatedTable.waitForTableToLoad();
105105
await paginatedTable.waitForTableData();
106106

107107
const initialUptimeValues = await paginatedTable.getColumnValues('Uptime');
108108
await page.waitForTimeout(2000); // Wait for some time to pass
109-
await paginatedTable.clickRefreshButton();
109+
await paginatedTable.getControls().clickRefreshButton();
110110
await paginatedTable.waitForTableData();
111111

112112
const updatedUptimeValues = await paginatedTable.getColumnValues('Uptime');
113113
expect(updatedUptimeValues).not.toEqual(initialUptimeValues);
114114
});
115115

116116
test('Row data can be retrieved correctly', async ({page}) => {
117-
const storageTable = new PaginatedTable(page);
117+
const nodesTable = new ClusterNodesTable(page);
118118

119-
await storageTable.waitForTableToLoad();
120-
await storageTable.waitForTableData();
119+
await nodesTable.waitForTableToLoad();
120+
await nodesTable.waitForTableData();
121121

122-
const rowData = await storageTable.getRowData(0);
122+
const rowData = await nodesTable.getRowData(0);
123123

124124
expect(rowData).toHaveProperty('Host');
125125
expect(rowData).toHaveProperty('Uptime');
@@ -130,7 +130,7 @@ test.describe('Test Nodes Paginated Table', async () => {
130130
});
131131

132132
test('Column values can be retrieved correctly', async ({page}) => {
133-
const paginatedTable = new PaginatedTable(page);
133+
const paginatedTable = new ClusterNodesTable(page);
134134

135135
await paginatedTable.waitForTableToLoad();
136136
await paginatedTable.waitForTableData();
@@ -144,12 +144,12 @@ test.describe('Test Nodes Paginated Table', async () => {
144144
});
145145

146146
test('Table displays empty data message when no entities', async ({page}) => {
147-
const paginatedTable = new PaginatedTable(page);
147+
const paginatedTable = new ClusterNodesTable(page);
148148

149149
await paginatedTable.waitForTableToLoad();
150150
await paginatedTable.waitForTableData();
151151

152-
await paginatedTable.search('Some Invalid search string !%#@[]');
152+
await paginatedTable.getControls().search('Some Invalid search string !%#@[]');
153153

154154
await paginatedTable.waitForTableData();
155155

@@ -158,19 +158,19 @@ test.describe('Test Nodes Paginated Table', async () => {
158158
});
159159

160160
test('Autorefresh updates data when initially empty data', async ({page}) => {
161-
const paginatedTable = new PaginatedTable(page);
161+
const paginatedTable = new ClusterNodesTable(page);
162162

163163
const emptyRequest = page.route(`${backend}/viewer/json/nodes?*`, async (route) => {
164164
await route.fulfill({json: {FoundNodes: 0, TotalNodes: 0, Nodes: []}});
165165
});
166-
await paginatedTable.clickRefreshButton();
166+
await paginatedTable.getControls().clickRefreshButton();
167167

168168
await emptyRequest;
169169

170170
const emptyDataMessage = await paginatedTable.getEmptyDataMessageLocator();
171171
await expect(emptyDataMessage).toContainText('No such nodes');
172172

173-
await paginatedTable.setRefreshInterval('15 sec');
173+
await paginatedTable.getControls().setRefreshInterval('15 sec');
174174

175175
const requestWithData = page.route(`${backend}/viewer/json/nodes?*`, async (route) => {
176176
await route.continue();

‎tests/suites/paginatedTable/paginatedTable.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {expect, test} from '@playwright/test';
33
import {NodesPage} from '../nodes/NodesPage';
44

55
import {setupEmptyNodesMock, setupLargeNodesMock, setupNodesMock} from './mocks';
6-
import {PaginatedTable} from './paginatedTable';
6+
import {ClusterNodesTable} from './paginatedTable';
77

88
test.describe('PaginatedTable', () => {
99
test('loads data in chunks when scrolling', async ({page}) => {
@@ -14,7 +14,7 @@ test.describe('PaginatedTable', () => {
1414
const nodesPage = new NodesPage(page);
1515
await nodesPage.goto();
1616

17-
const paginatedTable = new PaginatedTable(page);
17+
const paginatedTable = new ClusterNodesTable(page);
1818
await paginatedTable.waitForTableVisible();
1919
await paginatedTable.waitForTableData();
2020

@@ -53,7 +53,7 @@ test.describe('PaginatedTable', () => {
5353
const nodesPage = new NodesPage(page);
5454
await nodesPage.goto();
5555

56-
const paginatedTable = new PaginatedTable(page);
56+
const paginatedTable = new ClusterNodesTable(page);
5757
await paginatedTable.waitForTableVisible();
5858
await paginatedTable.waitForTableData();
5959

@@ -81,7 +81,7 @@ test.describe('PaginatedTable', () => {
8181
const nodesPage = new NodesPage(page);
8282
await nodesPage.goto();
8383

84-
const paginatedTable = new PaginatedTable(page);
84+
const paginatedTable = new ClusterNodesTable(page);
8585
await paginatedTable.waitForTableVisible();
8686

8787
// Verify empty state
@@ -98,7 +98,7 @@ test.describe('PaginatedTable', () => {
9898
const nodesPage = new NodesPage(page);
9999
await nodesPage.goto();
100100

101-
const paginatedTable = new PaginatedTable(page);
101+
const paginatedTable = new ClusterNodesTable(page);
102102
await paginatedTable.waitForTableVisible();
103103
await paginatedTable.waitForTableData();
104104

@@ -123,7 +123,7 @@ test.describe('PaginatedTable', () => {
123123
const nodesPage = new NodesPage(page);
124124
await nodesPage.goto();
125125

126-
const paginatedTable = new PaginatedTable(page);
126+
const paginatedTable = new ClusterNodesTable(page);
127127
await paginatedTable.waitForTableVisible();
128128
await paginatedTable.waitForTableData();
129129

0 commit comments

Comments
 (0)