[EASI-2990] Disable forms until all data loaded

cypress/e2e/characteristics.spec.js

@@ -1,16 +1,6 @@
-import { aliasQuery } from '../support/graphql-test-utils';
-
 describe('The Model Plan General Characteristics Form', () => {
   beforeEach(() => {
     cy.localLogin({ name: 'MINT', role: 'MINT_USER_NONPROD' });
-
-    cy.intercept('POST', '/api/graph/query', req => {
-      aliasQuery(req, 'GetGeneralCharacteristics');
-      aliasQuery(req, 'GetKeyCharacteristics');
-      aliasQuery(req, 'GetInvolvements');
-      aliasQuery(req, 'GetTargetsAndOptions');
-      aliasQuery(req, 'GetAuthority');
-    });
   });
 
   it('completes a Model Plan Characteristics', () => {
@@ -19,19 +9,14 @@ describe('The Model Plan General Characteristics Form', () => {
     // Clicks the General Charactstics tasklist item
     cy.get('[data-testid="characteristics"]').click();
 
+    // Page - /characteristics
+
     cy.location().should(loc => {
       expect(loc.pathname).to.match(
         /\/models\/.{36}\/task-list\/characteristics/
       );
     });
 
-    // Page - /characteristics
-
-    cy.wait('@GetGeneralCharacteristics')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(100);
-
     cy.get('[data-testid="model-plan-name"]').contains('for Empty Plan');
 
     cy.get('#plan-characteristics-is-new-model-no')
@@ -74,13 +59,8 @@ describe('The Model Plan General Characteristics Form', () => {
 
     // Page - /characteristics/key-charactertics
 
-    cy.wait('@GetKeyCharacteristics')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(100);
-
     cy.get('#plan-characteristics-alternative-payment-MIPS')
-      .check({ force: true })
+      .should('not.be.disabled')
       .check({ force: true })
       .should('be.checked');
 
@@ -90,6 +70,7 @@ describe('The Model Plan General Characteristics Form', () => {
 
     cy.get('#plan-characteristics-key-characteristics').within(() => {
       cy.get("input[type='text']")
+        .should('not.be.disabled')
         .type('payment')
         .should('have.value', 'payment');
     });
@@ -108,13 +89,8 @@ describe('The Model Plan General Characteristics Form', () => {
 
     // Page - /characteristics/involvements
 
-    cy.wait('@GetInvolvements')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(100);
-
     cy.get('#plan-characteristics-care-coordination-involved')
-      .check({ force: true })
+      .should('not.be.disabled')
       .check({ force: true })
       .should('be.checked');
 
@@ -148,12 +124,8 @@ describe('The Model Plan General Characteristics Form', () => {
 
     // Page - /characteristics/targets-and-options
 
-    cy.wait('@GetTargetsAndOptions')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(100);
-
     cy.get('#plan-characteristics-geographies-targeted')
+      .should('not.be.disabled')
       .check({ force: true })
       .should('be.checked');
 
@@ -189,12 +161,8 @@ describe('The Model Plan General Characteristics Form', () => {
 
     // Page - /characteristics/authority
 
-    cy.wait('@GetAuthority')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(100);
-
     cy.get('#plan-characteristics-rulemaking-required')
+      .should('not.be.disabled')
       .check({ force: true })
       .should('be.checked');
 

cypress/e2e/collaborator.spec.js

@@ -28,8 +28,11 @@ describe('The Collaborator/Team Member Form', () => {
 
     cy.get('#react-select-model-team-cedar-contact-input')
       .click()
-      .type('Jerry{enter}', { delay: 500 })
-      .should('have.value', 'Jerry Seinfeld, SF13');
+      .type('Jerry', { delay: 1000 });
+
+    cy.get('#react-select-model-team-cedar-contact-option-0')
+      .contains('Jerry Seinfeld, SF13')
+      .click();
 
     cy.contains('button', 'Add team member').should('be.disabled');
 
@@ -57,7 +60,10 @@ describe('The Collaborator/Team Member Form', () => {
 
     cy.get('input').should('be.disabled');
 
-    cy.get('select').select('Model Team').should('have.value', 'MODEL_TEAM');
+    cy.get('select')
+      .should('not.be.disabled')
+      .select('Model Team')
+      .should('have.value', 'MODEL_TEAM');
 
     cy.contains('button', 'Update team member').click();
 

cypress/e2e/discussions.spec.js

@@ -42,6 +42,7 @@ describe('Discussion Center', () => {
     cy.contains('button', 'Save answer').should('be.disabled');
 
     cy.get('#discussion-content')
+      .should('not.be.disabled')
       .type('Model characteristics is located within the task list.')
       .should(
         'have.value',

cypress/e2e/filterGroups.spec.js

@@ -42,6 +42,8 @@ describe('Filter Group in Read Only Sections', () => {
     cy.get('#read-only-side-nav__wrapper').should('not.exist');
     cy.get('.filtered-view-section--model-team').should('exist');
 
+    // Clear filter after viewing the CCW filtered group view
+
     cy.get('[data-testid="group-filter-banner"]').within(() => {
       cy.get('button').contains('Clear filter').click();
     });

cypress/e2e/modelPlan.spec.js

@@ -1,20 +1,6 @@
-import { aliasQuery } from '../support/graphql-test-utils';
-import verifyStatus from '../support/verifyRequestStatus';
-
 describe('The Model Plan Form', () => {
   beforeEach(() => {
     cy.localLogin({ name: 'MINT', role: 'MINT_USER_NONPROD' });
-
-    cy.intercept('POST', '/api/graph/query', req => {
-      aliasQuery(req, 'GetModelPlan');
-      aliasQuery(req, 'GetIsCollaborator');
-      aliasQuery(req, 'GetModelPlanBase');
-      aliasQuery(req, 'GetModelCollaborators');
-      aliasQuery(req, 'GetModelPlanInfo');
-      aliasQuery(req, 'GetBasics');
-      aliasQuery(req, 'GetMilestones');
-      aliasQuery(req, 'GetAllModelPlans');
-    });
   });
 
   it('fills out model plan name and creates plan', () => {
@@ -32,57 +18,38 @@ describe('The Model Plan Form', () => {
 
     cy.contains('button', 'Next').click();
 
-    cy.wait([
-      '@GetIsCollaborator',
-      '@GetModelPlanBase',
-      '@GetModelCollaborators'
-    ])
-      .then(verifyStatus)
-      .wait(500);
-
     cy.location().should(loc => {
       expect(loc.pathname).to.match(/\/models\/.{36}\/collaborators/);
     });
 
-    cy.get('[data-testid="continue-to-tasklist"]').click();
-
-    cy.wait('@GetModelPlan')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(500);
+    cy.get('[data-testid="page-loading"]').should('not.exist');
 
-    cy.contains('h1', 'Model Plan task list');
+    cy.get('[data-testid="continue-to-tasklist"]').click();
 
     // renames a model plan
     cy.location().should(loc => {
       expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/);
     });
 
+    cy.contains('h1', 'Model Plan task list');
+
     cy.contains('h3', 'Model basics');
 
     cy.contains('button', 'Start').click();
 
-    cy.wait('@GetModelPlanInfo')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(500);
-
     cy.location().should(loc => {
       expect(loc.pathname).to.match(/\/models\/.{36}\/task-list\/basics/);
     });
 
+    cy.get('[data-testid="fieldset"]').should('not.be.disabled');
+
     cy.get('#plan-basics-model-name')
       .clear()
       .type('Renamed Model Plan Name')
       .should('have.value', 'Renamed Model Plan Name');
 
     cy.contains('button', 'Save and return to task list').click();
 
-    cy.wait('@GetModelPlan')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(500);
-
     cy.location().should(loc => {
       expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/);
     });
@@ -94,10 +61,7 @@ describe('The Model Plan Form', () => {
 
     cy.get('[data-testid="basics"]').click();
 
-    cy.wait('@GetModelPlanInfo')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(500);
+    cy.get('[data-testid="fieldset"]').should('not.be.disabled');
 
     cy.get('#plan-basics-abbreviation').type('RMP').should('have.value', 'RMP');
 
@@ -119,17 +83,14 @@ describe('The Model Plan Form', () => {
 
     cy.contains('button', 'Next').click();
 
-    cy.wait('@GetBasics')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(500);
-
     cy.location().should(loc => {
       expect(loc.pathname).to.match(
         /\/models\/.{36}\/task-list\/basics\/overview/
       );
     });
 
+    cy.get('[data-testid="fieldset"]').should('not.be.disabled');
+
     cy.get('#ModelType-Voluntary').check({ force: true }).should('be.checked');
 
     cy.get('#ModelType-Problem')
@@ -149,17 +110,14 @@ describe('The Model Plan Form', () => {
 
     cy.contains('button', 'Next').click();
 
-    cy.wait('@GetMilestones')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(500);
-
     cy.location().should(loc => {
       expect(loc.pathname).to.match(
         /\/models\/.{36}\/task-list\/basics\/milestones/
       );
     });
 
+    cy.get('[data-testid="fieldset"]').should('not.be.disabled');
+
     cy.contains('h3', 'Anticipated high level timeline');
 
     cy.get('#Milestone-completeICIP')
@@ -202,11 +160,6 @@ describe('The Model Plan Form', () => {
 
     cy.contains('button', 'Save and return to task list').click();
 
-    cy.wait('@GetModelPlan')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(500);
-
     cy.location().should(loc => {
       expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/);
     });
@@ -240,11 +193,6 @@ describe('The Model Plan Form', () => {
       .should('be.not.disabled')
       .click();
 
-    cy.wait('@GetModelPlan')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(500);
-
     cy.location().should(loc => {
       expect(loc.pathname).to.match(/\/models\/.{36}\/task-list/);
     });
@@ -254,10 +202,7 @@ describe('The Model Plan Form', () => {
     // favorites and unfavorites a model plan
     cy.visit('/models');
 
-    cy.wait('@GetAllModelPlans')
-      .its('response.statusCode')
-      .should('eq', 200)
-      .wait(500);
+    cy.get('[data-testid="page-loading"]').should('not.exist');
 
     cy.contains('tr', 'Empty Plan').get('[data-cy="favorited"]');