@@ -14,7 +14,7 @@ Cypress.Commands.add('сheckFiltersModalOpened', () => {
14
14
} ) ;
15
15
16
16
Cypress . Commands . add ( 'collectGroupID' , ( ) => {
17
- let groupDataID = [ ] ;
17
+ const groupDataID = [ ] ;
18
18
cy . get ( '.group' ) . then ( ( $group ) => {
19
19
for ( let i = 0 ; i < $group . length ; i ++ ) {
20
20
groupDataID . push ( $group [ i ] . dataset . id ) ;
@@ -24,7 +24,7 @@ Cypress.Commands.add('collectGroupID', () => {
24
24
} ) ;
25
25
26
26
Cypress . Commands . add ( 'collectRuleID' , ( ) => {
27
- let ruleDataID = [ ] ;
27
+ const ruleDataID = [ ] ;
28
28
cy . get ( '.rule' ) . then ( ( $rule ) => {
29
29
for ( let i = 0 ; i < $rule . length ; i ++ ) {
30
30
ruleDataID . push ( $rule [ i ] . dataset . id ) ;
@@ -37,7 +37,7 @@ Cypress.Commands.add('clearFilters', () => {
37
37
cy . сheckFiltersModalOpened ( ) ;
38
38
cy . contains ( 'button' , 'Clear filters' ) . click ( ) ;
39
39
cy . get ( '.cvat-filters-modal-visible' ) . should ( 'not.exist' ) ;
40
- cy . get ( '.cvat-filters-modal' ) . should ( 'be.hidden ' ) ;
40
+ cy . get ( '.cvat-filters-modal' ) . should ( 'not.exist ' ) ;
41
41
} ) ;
42
42
43
43
Cypress . Commands . add ( 'addFiltersGroup' , ( groupIndex ) => {
@@ -66,7 +66,9 @@ Cypress.Commands.add('setGroupCondition', (groupIndex, condition) => {
66
66
67
67
Cypress . Commands . add (
68
68
'setFilter' ,
69
- ( { groupIndex, ruleIndex, field, operator, valueSource, value, label, labelAttr, submit } ) => {
69
+ ( {
70
+ groupIndex, ruleIndex, field, operator, valueSource, value, label, labelAttr, submit,
71
+ } ) => {
70
72
cy . сheckFiltersModalOpened ( ) ;
71
73
cy . collectGroupID ( ) . then ( ( groupIdIndex ) => {
72
74
cy . collectRuleID ( ) . then ( ( ruleIdIndex ) => {
@@ -104,16 +106,14 @@ Cypress.Commands.add(
104
106
. within ( ( ) => {
105
107
if ( field === 'Attributes' ) {
106
108
cy . get ( '[placeholder="Enter string"]' ) . last ( ) . type ( `${ value } {Enter}` ) ;
107
- } else {
108
- if ( ! valueSource ) {
109
- if ( field === 'ObjectID' || field === 'Width' || field === 'Height' ) {
110
- cy . get ( '[placeholder="Enter number"]' ) . type ( `${ value } {Enter}` ) ;
111
- } else {
112
- cy . get ( '[type="search"]' ) . last ( ) . type ( `${ value } {Enter}` ) ;
113
- }
109
+ } else if ( ! valueSource ) {
110
+ if ( field === 'ObjectID' || field === 'Width' || field === 'Height' ) {
111
+ cy . get ( '[placeholder="Enter number"]' ) . type ( `${ value } {Enter}` ) ;
114
112
} else {
115
- cy . contains ( '[type="button "]' , 'Select field ' ) . click ( ) ;
113
+ cy . get ( '[type="search "]' ) . last ( ) . type ( ` ${ value } {Enter}` ) ;
116
114
}
115
+ } else {
116
+ cy . contains ( '[type="button"]' , 'Select field ' ) . click ( ) ;
117
117
}
118
118
} ) ;
119
119
if ( valueSource ) {
@@ -124,7 +124,7 @@ Cypress.Commands.add(
124
124
cy . contains ( 'button' , 'Submit' ) . click ( ) ;
125
125
} ) ;
126
126
cy . get ( '.cvat-filters-modal-visible' ) . should ( 'not.exist' ) ;
127
- cy . get ( '.cvat-filters-modal' ) . should ( 'be.hidden ' ) ;
127
+ cy . get ( '.cvat-filters-modal' ) . should ( 'not.exist ' ) ;
128
128
}
129
129
} ) ;
130
130
} ) ;
@@ -143,5 +143,5 @@ Cypress.Commands.add('selectFilterValue', (filterValue) => {
143
143
cy . contains ( 'button' , 'Submit' ) . click ( ) ;
144
144
} ) ;
145
145
cy . get ( '.cvat-filters-modal-visible' ) . should ( 'not.exist' ) ;
146
- cy . get ( '.cvat-filters-modal' ) . should ( 'be.hidden ' ) ;
146
+ cy . get ( '.cvat-filters-modal' ) . should ( 'not.exist ' ) ;
147
147
} ) ;
0 commit comments