Skip to content

Commit 7e4a839

Browse files
committed
fix by pr comments
1 parent f283049 commit 7e4a839

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

tests/e2e/common-actions/browser-actions.ts

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,22 @@ export class BrowserActions {
7272
}
7373

7474
/**
75-
* Get not added in array folder selector
76-
* @param array folders selectors
75+
* Get node name by folders
76+
* @param startFolder start folder
7777
* @param folderName name of folder
7878
* @param delimiter string with delimiter value
7979
*/
80-
getFolderSelector(array: string[], folderName: string, delimiter: string): string {
81-
if (array.length === 0) {
82-
return `[data-testid="node-item_${folderName}${delimiter}"]`;
83-
}
80+
getNodeName(startFolder: string, folderName: string, delimiter: string): string {
81+
return startFolder + folderName + delimiter;
82+
83+
}
8484

85-
const lastSelector = array[array.length - 1].substring(0, array[array.length - 1].length - 2);
86-
return `${lastSelector}${folderName}${delimiter}"]`;
85+
/**
86+
* Get node selector by name
87+
* @param name node name
88+
*/
89+
getNodeSelector(name: string): Selector {
90+
return Selector(`[data-testid="node-item_${name}"]`);
8791
}
8892

8993
/**
@@ -99,19 +103,22 @@ export class BrowserActions {
99103

100104
for (let i = 0; i < foldersNumber; i++) {
101105
const innerFoldersNumber = folders[i].length;
102-
const array: string[] = [];
106+
let prevNodeSelector = '';
103107

104108
for (let j = 0; j < innerFoldersNumber; j++) {
105-
const folderSelector = this.getFolderSelector(array, folders[i][j], delimiter);
106-
array.push(folderSelector);
107-
await t.click(Selector(folderSelector));
109+
const nodeName = this.getNodeName(prevNodeSelector, folders[i][j], delimiter);
110+
const node = this.getNodeSelector(nodeName);
111+
await t.click(node);
112+
prevNodeSelector = nodeName;
108113
}
109114

110115
// Verify that the last folder level contains required keys
111116
const foundKeyName = `${folders[i].join(delimiter)}`;
117+
const firstFolderName = this.getNodeName('', folders[i][0], delimiter);
118+
const firstFolder = this.getNodeSelector(firstFolderName);
112119
await t
113120
.expect(Selector(`[data-testid*="node-item_${foundKeyName}"]`).find('[data-testid^="key-"]').exists).ok('Specific key not found')
114-
.click(array[0]);
121+
.click(firstFolder);
115122
}
116123
}
117124
}

0 commit comments

Comments
 (0)