Merge pull request #225 from uselagoon/test-network-idle-handlers

add idle handlers
uselagoon · Mar 1, 2024 · 6f86991 · 6f86991
2 parents 33fb8ad + 4d56d4c
commit 6f86991
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 1 deletion.
diff --git a/cypress/e2e/general/variables.cy.ts b/cypress/e2e/general/variables.cy.ts
@@ -28,6 +28,7 @@ describe('Project variables page', () => {
   it('Adds or updates a variable', () => {
     const { name, value } = testData.variables[0];
 
+    cy.waitForNetworkIdle('@idle', 500);
     environment.doAddVariable(name, value);
 
     cy.intercept('POST', Cypress.env('api')).as('addRequest');

diff --git a/cypress/e2e/rbac/developer.cy.ts b/cypress/e2e/rbac/developer.cy.ts
@@ -74,9 +74,12 @@ describe('DEVELOPER permission test suites', () => {
       cy.intercept('POST', Cypress.env('api'), req => {
         aliasMutation(req, 'addEnvVariable');
       });
+      registerIdleHandler('idle');
 
       const { name, value } = testData.variables[0];
 
+      cy.waitForNetworkIdle('@idle', 500);
+
       variable.doAddVariable(name, value);
 
       cy.wait('@gqladdEnvVariableMutation').then(interception => {

diff --git a/cypress/e2e/rbac/guest.cy.ts b/cypress/e2e/rbac/guest.cy.ts
@@ -70,12 +70,16 @@ describe('GUEST permission test suites', () => {
     it('Fails to add a variable - no permission for GUEST', () => {
       cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/project-variables`);
 
+      registerIdleHandler('idle');
+
       cy.intercept('POST', Cypress.env('api'), req => {
         aliasMutation(req, 'addEnvVariable');
       });
 
       const { name, value } = testData.variables[0];
 
+      cy.waitForNetworkIdle('@idle', 500);
+
       variable.doAddVariable(name, value);
 
       cy.wait('@gqladdEnvVariableMutation').then(interception => {

diff --git a/cypress/e2e/rbac/maintainer.cy.ts b/cypress/e2e/rbac/maintainer.cy.ts
@@ -65,13 +65,16 @@ describe('MAINTAINER permission test suites', () => {
     });
     it('Adds or updates a variable', () => {
       cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/project-variables`);
+      registerIdleHandler('idle');
 
       cy.intercept('POST', Cypress.env('api'), req => {
         aliasMutation(req, 'addEnvVariable');
       });
 
       const { name, value } = testData.variables[0];
 
+      cy.waitForNetworkIdle('@idle', 500);
+
       variable.doAddVariable(name, value);
 
       cy.wait('@gqladdEnvVariableMutation');

diff --git a/cypress/e2e/rbac/reporter.cy.ts b/cypress/e2e/rbac/reporter.cy.ts
@@ -67,12 +67,16 @@ describe('REPORTER permission test suites', () => {
     it('Fails to add a variable - no permission for REPORTER', () => {
       cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/project-variables`);
 
+      registerIdleHandler('idle');
+
       cy.intercept('POST', Cypress.env('api'), req => {
         aliasMutation(req, 'addEnvVariable');
       });
 
       const { name, value } = testData.variables[0];
 
+      cy.waitForNetworkIdle('@idle', 500);
+
       variable.doAddVariable(name, value);
 
       cy.wait('@gqladdEnvVariableMutation').then(interception => {

diff --git a/cypress/support/actions/deployment/DeploymentAction.ts b/cypress/support/actions/deployment/DeploymentAction.ts
@@ -4,7 +4,7 @@ const deployment = new DeploymentRepository();
 
 export default class deploymentAction {
   doCancelDeployment() {
-    deployment.getCancelDeploymentBtn().click();
+    deployment.getCancelDeploymentBtn().first().click();
 
     cy.wait('@gqlcancelDeploymentMutation');
 

diff --git a/cypress/support/actions/organizations/OverviewAction.ts b/cypress/support/actions/organizations/OverviewAction.ts
@@ -39,6 +39,8 @@ export default class OverviewAction {
 
     cy.wait('@gqlupdateOrganizationFriendlyNameMutation');
 
+    cy.waitForNetworkIdle('@idle', 500);
+
     overviewRepo
       .getfriendlyName()
       .invoke('text')
@@ -71,6 +73,8 @@ export default class OverviewAction {
 
     cy.wait('@gqlupdateOrganizationFriendlyNameMutation');
 
+    cy.waitForNetworkIdle('@idle', 500);
+
     overviewRepo
       .getDescription()
       .invoke('text')