@@ -72,18 +72,22 @@ export class BrowserActions {
72
72
}
73
73
74
74
/**
75
- * Get not added in array folder selector
76
- * @param array folders selectors
75
+ * Get node name by folders
76
+ * @param startFolder start folder
77
77
* @param folderName name of folder
78
78
* @param delimiter string with delimiter value
79
79
*/
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
+ }
84
84
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 } "]` ) ;
87
91
}
88
92
89
93
/**
@@ -99,19 +103,22 @@ export class BrowserActions {
99
103
100
104
for ( let i = 0 ; i < foldersNumber ; i ++ ) {
101
105
const innerFoldersNumber = folders [ i ] . length ;
102
- const array : string [ ] = [ ] ;
106
+ let prevNodeSelector = '' ;
103
107
104
108
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 ;
108
113
}
109
114
110
115
// Verify that the last folder level contains required keys
111
116
const foundKeyName = `${ folders [ i ] . join ( delimiter ) } ` ;
117
+ const firstFolderName = this . getNodeName ( '' , folders [ i ] [ 0 ] , delimiter ) ;
118
+ const firstFolder = this . getNodeSelector ( firstFolderName ) ;
112
119
await t
113
120
. expect ( Selector ( `[data-testid*="node-item_${ foundKeyName } "]` ) . find ( '[data-testid^="key-"]' ) . exists ) . ok ( 'Specific key not found' )
114
- . click ( array [ 0 ] ) ;
121
+ . click ( firstFolder ) ;
115
122
}
116
123
}
117
124
}
0 commit comments