Skip to content

Commit dbe0380

Browse files
committed
Comments from check list
1 parent 1ec6d33 commit dbe0380

File tree

1 file changed

+30
-16
lines changed

1 file changed

+30
-16
lines changed

tests/e2e/tests/critical-path/tree-view/tree-view-improvements.e2e.ts

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ test
3333
await t.click(browserPage.patternModeBtn);
3434
await browserPage.deleteKeysByNames(keyNames);
3535
await deleteStandaloneDatabaseApi(ossStandaloneConfig);
36-
})('Tree view preselected folder, Filterred Tree view preselected folder, Refreshed Tree view preselected folder, Search capability Filterred Tree view preselected folder', async t => {
37-
// Search capability Refreshed Tree view preselected folder
36+
})('Tree view preselected folder', async t => {
3837
keyName1 = common.generateWord(10); // used to create index name
3938
keyName2 = common.generateWord(10); // used to create index name
4039
keynameSingle = common.generateWord(10);
@@ -51,60 +50,65 @@ test
5150
// Create 5 keys
5251
await cliPage.sendCommandsInCli(commands);
5352
await t.click(browserPage.treeViewButton);
53+
// The folder without any patterns selected and the list of keys is displayed when there is a folder without any patterns
5454
await verifyKeysDisplayedInTheList([keynameSingle]);
5555

5656
await browserPage.openTreeFolders([await browserPage.getTextFromNthTreeElement(1)]);
5757
await browserPage.selectFilterGroupType(KeyTypesTexts.Set);
58+
// The folder without any namespaces is selected (if exists) when folder does not exist after search/filter
5859
await verifyKeysDisplayedInTheList([keynameSingle]);
5960

6061
await t.click(browserPage.setDeleteButton);
61-
// verify that first element in the tree is "keys" and other folders are closed
62+
// The folder without any patterns selected and the list of keys is displayed when there is a folder without any patterns
6263
await verifyKeysDisplayedInTheList([keynameSingle]);
6364
await verifyKeysNotDisplayedInTheList([`${keyNames[0]}:1`, `${keyNames[2]}:2`]);
6465

6566
// switch between browser view and tree view
6667
await t.click(browserPage.browserViewButton)
6768
.click(browserPage.treeViewButton);
68-
// Switch to tree view
6969
await browserPage.deleteKeyByName(keyNames[4]);
7070
await t.click(browserPage.clearFilterButton);
7171
// get first folder name
7272
const firstTreeItemText = await browserPage.getTextFromNthTreeElement(0);
7373
const firstTreeItemKeys = Selector(`[data-testid="node-item_${firstTreeItemText}:keys:keys:"]`); // keys after node item opened
74-
// verify that the first folder with namespaces is expanded and selected
74+
// The first folder with namespaces is expanded and selected when there is no folder without any patterns
7575
await t.expect(firstTreeItemKeys.visible)
7676
.ok('First folder is not expanded');
77-
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]); // verify created keys are visible
77+
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]);
7878

7979
const commands1 = [
8080
`HSET ${keyNames[4]} field value`
8181
];
82-
// Create 4 keys and index
82+
8383
await cliPage.sendCommandsInCli(commands1);
84-
await t.click(browserPage.refreshKeysButton); // refresh keys
84+
await t.click(browserPage.refreshKeysButton);
85+
// Refreshed Tree view preselected folder
8586
await t.expect(firstTreeItemKeys.visible)
8687
.ok('Folder is not selected');
87-
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]); // verify created keys are visible
88+
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]);
8889

8990
await browserPage.selectFilterGroupType(KeyTypesTexts.Hash);
9091
await t.expect(firstTreeItemKeys.visible).ok('Folder is not selected after searching with HASH');
91-
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]); // verify created keys are visible
92+
// Filterred Tree view preselected folder
93+
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]);
9294

9395
await browserPage.searchByKeyName('*');
96+
// Search capability Filterred Tree view preselected folder
9497
await t.expect(firstTreeItemKeys.visible).ok('Folder is not selected');
95-
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]); // verify created keys are visible
98+
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]);
9699

97100
await t.click(browserPage.clearFilterButton);
101+
// Filterred Tree view preselected folder
98102
await t.expect(firstTreeItemKeys.visible).ok('Folder is not selected');
99-
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]); // verify created keys are visible
103+
await verifyKeysDisplayedInTheList([`${firstTreeItemText}:1`, `${firstTreeItemText}:2`]);
100104

101105
await browserPage.selectFilterGroupType(KeyTypesTexts.Stream);
106+
// Filterred Tree view preselected folder
102107
await t.expect(browserPage.keyListTable.textContent).contains('No results found.', 'Key is not found message not displayed');
103108

104109
await t.click(browserPage.streamDeleteButton); // clear stream from filter
105-
await t.expect(
106-
Selector('[role="rowgroup"]').find('div').withText('No results found.').visible)
107-
.notOk('No result text is still visible');
110+
// Filterred Tree view preselected folder
111+
await t.expect(browserPage.keyListTable.textContent).notContains('No results found.', 'Key is not found message still displayed');
108112
await t.expect(
109113
firstTreeItemKeys.visible)
110114
.notOk('First folder is expanded');
@@ -127,6 +131,7 @@ test
127131
await t.click(Selector(`[data-testid="${`node-item_${folders[0]}:`}"]`)); // close folder
128132
await browserPage.openTreeFolders(folders);
129133
await t.click(browserPage.refreshKeysButton);
134+
// Refreshed Tree view preselected folder for index based search
130135
await t.expect(
131136
Selector(`[data-testid="node-item_${folders[0]}:${folders[1]}:keys:keys:"]`).visible)
132137
.ok('Folder is not selected');
@@ -140,7 +145,7 @@ test
140145
await t.click(browserPage.patternModeBtn);
141146
await browserPage.deleteKeysByNames(keyNames.slice(1));
142147
await deleteStandaloneDatabaseApi(ossStandaloneConfig);
143-
})('Refreshed Tree view preselected folder, Filterred Tree view preselected folder', async t => {
148+
})('Search capability Refreshed Tree view preselected folder', async t => {
144149
keyName1 = common.generateWord(10); // used to create index name
145150
keyName2 = common.generateWord(10); // used to create index name
146151
keynameSingle = common.generateWord(10);
@@ -154,16 +159,25 @@ test
154159
];
155160
await cliPage.sendCommandsInCli(commands);
156161
await t.click(browserPage.treeViewButton);
162+
// The folder without any patterns selected and the list of keys is displayed when there is a folder without any patterns
157163
await verifyKeysDisplayedInTheList([keynameSingle]);
158164

159165
await browserPage.openTreeFolders([keyName1]); // Type: hash
160166
await browserPage.openTreeFolders([keyName2]); // Type: list
161167
await browserPage.selectFilterGroupType(KeyTypesTexts.Hash);
168+
// The first folder with namespaces is expanded and selected when folder and folder without any namespaces does not exist after search/filter
162169
await verifyKeysDisplayedInTheList([keyNames[0], keyNames[1]]);
163170

164171
await t.click(browserPage.hashDeleteButton);
165172
await cliPage.sendCommandsInCli([`DEL ${keyNames[0]}`]);
166173
await t.click(browserPage.refreshKeysButton); // refresh keys
174+
// The previously selected folder is preselected when key does not exist after keys refresh
175+
await verifyKeysDisplayedInTheList([keyNames[1]]);
176+
await verifyKeysNotDisplayedInTheList([keyNames[0], keyNames[2], keyNames[3], keyNames[4]]);
177+
178+
await browserPage.searchByKeyName('*');
179+
await t.click(browserPage.refreshKeysButton);
180+
// Search capability Refreshed Tree view preselected folder
167181
await verifyKeysDisplayedInTheList([keyNames[1]]);
168182
await verifyKeysNotDisplayedInTheList([keyNames[0], keyNames[2], keyNames[3], keyNames[4]]);
169183
});

0 commit comments

Comments
 (0)