@@ -39,8 +39,10 @@ describe('Workers page - Edit worker', function () {
3939 cy . get ( '#firstName' ) . should ( 'be.visible' ) . type ( initialFirstName ) ;
4040 cy . get ( '#lastName' ) . should ( 'be.visible' ) . type ( initialLastName ) ;
4141 cy . wait ( 500 ) ;
42+
43+ cy . intercept ( 'POST' , '**/api/workers/create' ) . as ( 'createWorker' ) ;
4244 cy . get ( '#workerSaveBtn' ) . should ( 'be.visible' ) . click ( ) ;
43- cy . get ( '#spinner-animation' ) . should ( 'not.exist' ) ;
45+ cy . wait ( '@createWorker' , { timeout : 30000 } ) ;
4446 cy . get ( '#workerCreateBtn' ) . should ( 'be.visible' ) ;
4547 } ) ;
4648
@@ -60,8 +62,10 @@ describe('Workers page - Edit worker', function () {
6062 cy . get ( '#firstNameEdit' ) . clear ( ) . type ( newFirstName ) ;
6163 cy . get ( '#lastNameEdit' ) . clear ( ) . type ( newLastName ) ;
6264 cy . wait ( 500 ) ;
65+
66+ cy . intercept ( 'POST' , '**/api/workers/update' ) . as ( 'updateWorker' ) ;
6367 cy . get ( '#workerEditSaveBtn' ) . should ( 'be.visible' ) . click ( ) ;
64- cy . get ( '#spinner-animation' ) . should ( 'not.exist' ) ;
68+ cy . wait ( '@updateWorker' , { timeout : 30000 } ) ;
6569 cy . get ( '#workerCreateBtn' ) . should ( 'be.visible' ) ;
6670
6771 // Verify changes
@@ -84,8 +88,10 @@ describe('Workers page - Edit worker', function () {
8488 cy . get ( '#firstNameEdit' ) . clear ( ) . type ( newFirstName ) ;
8589 cy . get ( '#lastNameEdit' ) . clear ( ) . type ( newLastName ) ;
8690 cy . wait ( 500 ) ;
91+
92+ cy . intercept ( 'POST' , '**/api/workers/update' ) . as ( 'updateWorker' ) ;
8793 cy . get ( '#workerEditSaveBtn' ) . should ( 'be.visible' ) . click ( ) ;
88- cy . get ( '#spinner-animation' ) . should ( 'not.exist' ) ;
94+ cy . wait ( '@updateWorker' , { timeout : 30000 } ) ;
8995 cy . get ( '#workerCreateBtn' ) . should ( 'be.visible' ) ;
9096
9197 // Verify changes
@@ -127,9 +133,10 @@ describe('Workers page - Edit worker', function () {
127133
128134 after ( ( ) => {
129135 // Clean up: Delete the test worker
136+ cy . intercept ( 'POST' , '**/api/workers/delete' ) . as ( 'deleteWorker' ) ;
130137 cy . get ( '#workerDeleteBtn' ) . last ( ) . should ( 'be.visible' ) . click ( ) ;
131138 cy . get ( '#saveDeleteBtn' ) . should ( 'be.visible' ) . click ( ) ;
132- cy . get ( '#spinner-animation' ) . should ( 'not.exist' ) ;
139+ cy . wait ( '@deleteWorker' , { timeout : 30000 } ) ;
133140 cy . wait ( 500 ) ;
134141
135142 // Clean up: Delete the device user
@@ -138,9 +145,10 @@ describe('Workers page - Edit worker', function () {
138145
139146 cy . get ( '#deviceUserFirstName' ) . each ( ( $el , index ) => {
140147 if ( $el . text ( ) === deviceUserFirstName ) {
148+ cy . intercept ( 'POST' , '**/api/device-users/delete' ) . as ( 'deleteUser' ) ;
141149 cy . get ( '#deleteDeviceUserBtn' ) . eq ( index ) . click ( ) ;
142150 cy . get ( '#saveDeleteBtn' ) . should ( 'be.visible' ) . click ( ) ;
143- cy . get ( '#spinner-animation' ) . should ( 'not.exist' ) ;
151+ cy . wait ( '@deleteUser' , { timeout : 30000 } ) ;
144152 cy . get ( '#newDeviceUserBtn' ) . should ( 'be.visible' ) ;
145153 return false ; // break the loop
146154 }
0 commit comments