Skip to content

Commit 757f7f9

Browse files
Copilotrenemadsen
andcommitted
Replace spinner waits with API intercepts in device-users and workers tests
Co-authored-by: renemadsen <[email protected]>
1 parent a82497a commit 757f7f9

File tree

4 files changed

+32
-12
lines changed

4 files changed

+32
-12
lines changed

eform-client/cypress/e2e/d/device-users.add.spec.cy.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ describe('Device users page - Add new device user', function () {
2828
cy.get('#newDeviceUserBtn').should('be.visible').click();
2929
cy.get('#firstName').should('be.visible').type(nameDeviceUser);
3030
cy.get('#lastName').should('be.visible').type(surname);
31+
32+
cy.intercept('POST', '**/api/device-users/create').as('createUser');
3133
cy.get('#saveCreateBtn').should('be.visible').should('be.enabled').click();
32-
cy.get('#spinner-animation').should('not.exist');
34+
cy.wait('@createUser', { timeout: 30000 });
3335
cy.get('#newDeviceUserBtn').should('be.visible');
3436

3537
// Verify the user was created
@@ -116,9 +118,10 @@ describe('Device users page - Should not add new device user', function () {
116118
// Find and delete the test user
117119
cy.get('#deviceUserFirstName').each(($el, index) => {
118120
if ($el.text() === nameDeviceUser) {
121+
cy.intercept('POST', '**/api/device-users/delete').as('deleteUser');
119122
cy.get('#deleteDeviceUserBtn').eq(index).click();
120123
cy.get('#saveDeleteBtn').should('be.visible').click();
121-
cy.get('#spinner-animation').should('not.exist');
124+
cy.wait('@deleteUser', { timeout: 30000 });
122125
cy.get('#newDeviceUserBtn').should('be.visible');
123126
return false; // break the loop
124127
}

eform-client/cypress/e2e/d/device-users.delete.spec.cy.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ describe('Device users page - Delete device user', function () {
1717
cy.get('#newDeviceUserBtn', { timeout: 10000 }).should('be.visible').click();
1818
cy.get('#firstName').should('be.visible').type(firstName);
1919
cy.get('#lastName').should('be.visible').type(lastName);
20+
21+
cy.intercept('POST', '**/api/device-users/create').as('createUser');
2022
cy.get('#saveCreateBtn').should('be.visible').click();
21-
cy.get('#spinner-animation').should('not.exist');
23+
cy.wait('@createUser', { timeout: 30000 });
2224
cy.get('#newDeviceUserBtn').should('be.visible');
2325
});
2426

@@ -47,9 +49,10 @@ describe('Device users page - Delete device user', function () {
4749
cy.get('#deviceUserId').should('be.visible');
4850

4951
// Click delete button on last row
52+
cy.intercept('POST', '**/api/device-users/delete').as('deleteUser');
5053
cy.get('#deleteDeviceUserBtn').last().should('be.visible').click();
5154
cy.get('#saveDeleteBtn').should('be.visible').click();
52-
cy.get('#spinner-animation').should('not.exist');
55+
cy.wait('@deleteUser', { timeout: 30000 });
5356

5457
// Navigate back to device users page
5558
deviceUsersPage.Navbar.goToDeviceUsersPage();

eform-client/cypress/e2e/d/device-users.edit.spec.cy.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ describe('Device users page - Edit device user', function () {
1717
cy.get('#newDeviceUserBtn', { timeout: 10000 }).should('be.visible').click();
1818
cy.get('#firstName').should('be.visible').type(firstName);
1919
cy.get('#lastName').should('be.visible').type(lastName);
20+
21+
cy.intercept('POST', '**/api/device-users/create').as('createUser');
2022
cy.get('#saveCreateBtn').should('be.visible').click();
21-
cy.get('#spinner-animation').should('not.exist');
23+
cy.wait('@createUser', { timeout: 30000 });
2224
cy.get('#newDeviceUserBtn').should('be.visible');
2325
});
2426

@@ -37,8 +39,10 @@ describe('Device users page - Edit device user', function () {
3739

3840
// Edit first name
3941
cy.get('#firstName').clear().type(newName);
42+
43+
cy.intercept('POST', '**/api/device-users/update').as('updateUser');
4044
cy.get('#saveEditBtn').should('be.visible').click();
41-
cy.get('#spinner-animation').should('not.exist');
45+
cy.wait('@updateUser', { timeout: 30000 });
4246
cy.get('#newDeviceUserBtn').should('be.visible');
4347

4448
// Verify changes
@@ -62,8 +66,10 @@ describe('Device users page - Edit device user', function () {
6266

6367
// Edit last name
6468
cy.get('#lastName').clear().type(newSurname);
69+
70+
cy.intercept('POST', '**/api/device-users/update').as('updateUser');
6571
cy.get('#saveEditBtn').should('be.visible').click();
66-
cy.get('#spinner-animation').should('not.exist');
72+
cy.wait('@updateUser', { timeout: 30000 });
6773
cy.get('#newDeviceUserBtn').should('be.visible');
6874

6975
// Verify changes
@@ -85,8 +91,10 @@ describe('Device users page - Edit device user', function () {
8591
// Edit both fields
8692
cy.get('#firstName').clear().type(newName);
8793
cy.get('#lastName').clear().type(newSurname);
94+
95+
cy.intercept('POST', '**/api/device-users/update').as('updateUser');
8896
cy.get('#saveEditBtn').should('be.visible').click();
89-
cy.get('#spinner-animation').should('not.exist');
97+
cy.wait('@updateUser', { timeout: 30000 });
9098
cy.get('#newDeviceUserBtn').should('be.visible');
9199

92100
// Verify changes

eform-client/cypress/e2e/h/workers.add.spec.cy.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ describe('Workers page - Add new worker', function () {
5050
cy.get('#firstName').should('be.visible').type(firstName);
5151
cy.get('#lastName').should('be.visible').type(lastName);
5252
cy.wait(500);
53+
54+
cy.intercept('POST', '**/api/workers/create').as('createWorker');
5355
cy.get('#workerSaveBtn').should('be.visible').should('be.enabled').click();
54-
cy.get('#spinner-animation').should('not.exist');
56+
cy.wait('@createWorker', { timeout: 30000 });
5557
cy.get('#workerCreateBtn').should('be.visible');
5658

5759
// Verify the worker was created
@@ -87,8 +89,10 @@ describe('Workers page - Add new worker', function () {
8789
cy.get('#firstName').should('be.visible').type(firstName);
8890
cy.get('#lastName').should('be.visible').type(lastName);
8991
cy.wait(500);
92+
93+
cy.intercept('POST', '**/api/workers/create').as('createWorker');
9094
cy.get('#workerSaveBtn').should('be.visible').should('be.enabled').click();
91-
cy.get('#spinner-animation').should('not.exist');
95+
cy.wait('@createWorker', { timeout: 30000 });
9296
cy.get('#workerCreateBtn').should('be.visible');
9397

9498
// Verify the worker was created
@@ -112,9 +116,10 @@ describe('Workers page - Add new worker', function () {
112116

113117
for (let i = 0; i < workersToDelete; i++) {
114118
// Always delete the last worker
119+
cy.intercept('POST', '**/api/workers/delete').as('deleteWorker');
115120
cy.get('#workerDeleteBtn').last().should('be.visible').click();
116121
cy.get('#saveDeleteBtn').should('be.visible').click();
117-
cy.get('#spinner-animation').should('not.exist');
122+
cy.wait('@deleteWorker', { timeout: 30000 });
118123
cy.wait(500);
119124
}
120125

@@ -130,9 +135,10 @@ describe('Workers page - Add new worker', function () {
130135

131136
cy.get('#deviceUserFirstName').each(($el, index) => {
132137
if ($el.text() === deviceUserFirstName) {
138+
cy.intercept('POST', '**/api/device-users/delete').as('deleteUser');
133139
cy.get('#deleteDeviceUserBtn').eq(index).click();
134140
cy.get('#saveDeleteBtn').should('be.visible').click();
135-
cy.get('#spinner-animation').should('not.exist');
141+
cy.wait('@deleteUser', { timeout: 30000 });
136142
cy.get('#newDeviceUserBtn').should('be.visible');
137143
return false; // break the loop
138144
}

0 commit comments

Comments
 (0)