Merge branch 'fixing-contact-us-submission-error' of https://github.com/civictechindex/CTI-website-frontend into fixing-contact-us-submission-error

Author: bhaggya

cypress/integration/pages/organizations.spec.js

@@ -3,18 +3,18 @@ describe('Contributors Page (using API)', () => {
   const parentOrg = 'Code for America';
   const affiliatedOrg = 'Code for ABQ';
   const affiliatedOrgPartial = 'ABQ';
-  const parentOrgCount = 24;
+  const parentOrgCount1 = 24;
+  const parentOrgCount2 = 1;
 
-  it(`should load grandparentOrg, ${parentOrgCount} children, parentOrg, affiliatedOrg`, () => {
+  it(`should load grandparentOrg, parentOrg, affiliatedOrg`, () => {
     cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/organizations/`).as('getOrganizations');
     cy.visit('/organizations/all');
     cy.wait('@getOrganizations');
     cy.get('[data-cy=index-contributors-checkbox] input:checkbox').uncheck();
     cy.contains(grandparentOrg).should('have.length', 1);
-    // cy.get('[href*=codeforall]').should('have.length', 1);
     cy.get('[data-cy=code-for-all-chevron]').click();
     cy.get('[data-cy=affiliated-organizations]').within(() => {
-      cy.get('[data-cy=thumbnail-dropdown]').should('have.length', parentOrgCount);
+      cy.get('[data-cy=thumbnail-dropdown]').should('have.length', parentOrgCount1);
       cy.get('[data-cy=thumbnail-dropdown]')
         .contains(parentOrg)
         .parentsUntil('[data-cy=thumbnail-dropdown]')
@@ -27,36 +27,33 @@ describe('Contributors Page (using API)', () => {
 
   it('should find affiliatedOrg via search', () => {
     cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/organizations/`).as('getOrganizations');
-    cy.visit('/organizations/all');
+    cy.visit('/organizations/affiliated');
     cy.wait('@getOrganizations');
-    cy.get('[data-cy=organization-search]').type(affiliatedOrg);
-    cy.get('[class*=makeStyles-gpGrid]').click();
+    cy.get('[data-cy=organization-search]').type(affiliatedOrg).type('{enter}');
     cy.get('[data-cy=affiliated-organizations]').within(() => {
       cy.get('[data-cy=thumbnail-dropdown]').should('have.length', 1);
       cy.get('[data-cy=contributor-thumbnail-text]').contains(affiliatedOrg);
     });
-    cy.get('[class*=endAdornment]').click().within(() => {
-      cy.get('button').click();
-    });
     cy.get('[data-cy=affiliated-organizations]').within(() => {
-      cy.get('[data-cy=thumbnail-dropdown]').should('have.length', parentOrgCount);
+      cy.get('[data-cy=thumbnail-dropdown]').should('have.length', parentOrgCount2);
     });
+    cy.get('[data-cy=organization-search]').clear();
   });
 
   it('should find affiliatedOrg via partial search', () => {
     cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/organizations/`).as(
       'getOrganizations'
     );
-    cy.visit('/organizations/all');
+    cy.visit('/organizations/affiliated');
     cy.wait('@getOrganizations');
     cy.get('[data-cy=organization-search]').type(affiliatedOrgPartial);
     cy.get('[data-cy=organization-search-list]').should('have.length', 1);
     cy.get('[data-cy=organization-search-list]').click();
-    cy.get('[class*=makeStyles-gpGrid]').click();
     cy.get('[data-cy=affiliated-organizations]').within(() => {
       cy.get('[data-cy=thumbnail-dropdown]').should('have.length', 1);
       cy.get('[data-cy=contributor-thumbnail-text]').contains(affiliatedOrg);
     });
+    cy.get('[data-cy=organization-search]').clear();
   });
 
   it('should visit organizations page from home page link', () => {
@@ -78,8 +75,9 @@ describe('Contributors Page (using fixture)', () => {
   before(() => {
     cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/organizations/`, {
       fixture: 'orgs.json',
-    });
+    }).as('getOrganizations');
     cy.visit('/organizations/all');
+    cy.wait('@getOrganizations');
   });
 
   it('should load 24 affiliated orgs', () => {
@@ -107,7 +105,11 @@ describe('Contributors Page (using fixture)', () => {
   });
 
   it('should navigate to unaffiliated and show unaffiliated orgs tab selected', () => {
+    cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/organizations/`, {
+      fixture: 'orgs.json',
+    }).as('getOrganizations');
     cy.visit('/organizations/unaffiliated');
+    cy.wait('@getOrganizations');
     cy.get('[class*=MuiTabs-flexContainer]').within(() => {
       cy.get('button')
         .eq(0)
@@ -125,7 +127,11 @@ describe('Contributors Page (using fixture)', () => {
   });
 
   it('should navigate to affiliated and show affiliated orgs tab selected', () => {
+    cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/organizations/`, {
+      fixture: 'orgs.json',
+    }).as('getOrganizations');
     cy.visit('/organizations/affiliated');
+    cy.wait('@getOrganizations');
     cy.get('[class*=MuiTabs-flexContainer]').within(() => {
       cy.get('button')
         .eq(0)
@@ -209,7 +215,7 @@ describe('Contributors Page (using fixture)', () => {
       });
       cy.get('[class*=affiliatedThumbnailsWrapper]')
         .find('[class*=afflnThumbnails]')
-        .should('have.length', 8);
+        .should('have.length', 6);
     });
   });
 
@@ -221,7 +227,7 @@ describe('Contributors Page (using fixture)', () => {
       });
       cy.get('[class*=affiliatedThumbnailsWrapper]')
         .find('[class*=afflnThumbnails]')
-        .should('have.length.greaterThan', 8);
+        .should('have.length.greaterThan', 6);
     });
   });
 
@@ -245,12 +251,15 @@ describe('Contributors Page (using fixture)', () => {
 
   // TODO: click open Code for America. need to adjust 25 number to 7 (?)
   it('should show index contributor indicators', () => {
+    cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/organizations/`, {
+      fixture: 'orgs.json',
+    }).as('getOrganizations');
     cy.visit('/organizations/affiliated');
+    cy.wait('@getOrganizations');
     cy.get('[data-cy=index-contributors-checkbox] input:checkbox').check();
     cy.get('[class*=makeStyles-gpGrid]').within(() => {
       cy.get('[class*=contributorIcon]').should('exist');
     });
-    cy.get('[class*=makeStyles-gpGrid]').click();
     // cy.get('[data-cy=contributor-icon]').should('have.length', 25);
     cy.get('[class*=makeStyles-dropDownGrid]').within(() => {
       cy.contains('Code for America').parent().parent().parent().within(() => {

package-lock.json

@@ -6,7 +6,7 @@
     "@material-ui/core": "^4.11.4",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.58",
-    "axios": "^0.21.1",
+    "axios": "^0.21.2",
     "ga-4-react": "^0.1.281",
     "js-priority-queue": "^0.1.5",
     "material-ui-chip-input": "^2.0.0-beta.2",
@@ -60,7 +60,7 @@
     "@testing-library/react": "^12.0.0",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "cypress": "^8.3.0",
+    "cypress": "^8.7.0",
     "eslint": "^6.8.0",
     "eslint-plugin-cypress": "^2.11.3",
     "eslint-plugin-react": "^7.23.2",