Merge branch 'main' into update-landing-909

Author: bruceplai

.env

@@ -1 +1 @@
-REACT_APP_API_URL=https://api.civictechindex.org
+REACT_APP_API_URL=https://api-stage.civictechindex.org

.env.development

@@ -0,0 +1 @@
+REACT_APP_API_URL=https://api-stage.civictechindex.org

.env.production

@@ -0,0 +1 @@
+REACT_APP_API_URL=https://api.civictechindex.org

cypress.json

@@ -2,7 +2,8 @@
   "baseUrl": "http://localhost:3000",
   "defaultCommandTimeout": 60000,
   "env": {
-    "REACT_APP_API_URL": "https://api.civictechindex.org"
+    "REACT_APP_API_URL": "https://api-stage.civictechindex.org",
+    "GITHUB_API_URL": "https://api.github.com"
   },
   "ignoreTestFiles": ["add-org.spec.js"]
 }

cypress/integration/pages/faq.spec.js

@@ -1,16 +1,23 @@
-const SEARCH = 'organization';
-const Q1 = 'Can I add multiple projects';
-const Q2 = 'Can I change the organization my project is listed under';
-const A1 = 'Yes, Please follow the link to add multiple projects.';
-const A2 = 'Yes, you can change the organization of your project.';
+const SEARCH = 'civic';
+// const Q1 = 'Can I add multiple projects';
+const Q2 = 'What is Civic Tech';
+// const A1 = 'Yes, Please follow the link to add multiple projects.';
+const A2 = 'Civic technology, or civic tech, enhances the relationship between the people and government';
 
 describe('FAQ Page (using API)', () => {
-  it('gets faq by search', () => {
+  before(() => {
+    cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/faqs/*`).as(
+      'getFaqs'
+    );
     cy.visit('/about/faq');
-    cy.get('[data-cy=search-faq]').click({ force: true }).type(SEARCH);
+    cy.wait('@getFaqs');
+  });
+
+  it('gets faq by search', () => {
     cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/faqs/*`).as(
       'getFaqs'
     );
+    cy.get('[data-cy=search-faq]').click({ force: true }).type(SEARCH);
     cy.wait('@getFaqs');
     cy.get('[data-cy=faq-question]')
       .first()
@@ -20,24 +27,33 @@ describe('FAQ Page (using API)', () => {
   });
 });
 
-describe('FAQ Page (using fixture)', () => {
-  before(() => {
-    cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/faqs/`, {
-      fixture: 'faqs.json',
-    });
-    cy.visit('/about/faq');
-  });
+/*
+ * describe('FAQ Page (using fixture)', () => {
+ *   before(() => {
+ *     cy.intercept('GET', `${Cypress.env('REACT_APP_API_URL')}/api/faqs/*`, (req) => {
+ *       req.reply({
+ *         statusCode: 200,
+ *         fixture: 'faqs.json',
+ *       });
+ *     });
+ *     cy.visit('/about/faq');
+ *   });
+ */
 
-  it('title section loads', () => {
-    cy.contains('How can we help?');
-  });
+/*
+ *   it('title section loads', () => {
+ *     cy.contains('How can we help?');
+ *   });
+ */
 
-  it('default faq list is loaded', () => {
-    cy.get('[data-cy=faq-question]').should('have.length', 10);
-    cy.get('[data-cy=faq-question]')
-      .first()
-      .contains(Q1)
-      .click({ force: true });
-    cy.get('[data-cy=faq-answer]').first().should('contain', A1);
-  });
-});
+/*
+ *   it('default faq list is loaded', () => {
+ *     cy.get('[data-cy=faq-question]').should('have.length', 10);
+ *     cy.get('[data-cy=faq-question]')
+ *       .first()
+ *       .contains(Q1)
+ *       .click({ force: true });
+ *     cy.get('[data-cy=faq-answer]').first().should('contain', A1);
+ *   });
+ * });
+ */

cypress/integration/pages/projects.spec.js

@@ -20,7 +20,11 @@ describe('Projects Page (Search Projects)', () => {
   });
 
   it('loads search tips', () => {
+    cy.intercept(`${Cypress.env('GITHUB_API_URL')}/search/repositories*`).as(
+      'getProjects'
+    );
     cy.get('[data-cy=search-projects]').click().type(SEARCH).type('{enter}');
+    cy.wait('@getProjects');
     cy.get('[data-cy=how-to-improve-your-search-results]').click();
     cy.get('[data-cy=search-tips').within(() => {
       cy.get('p').first().contains('Need more search results?');

cypress/integration/pages/tag-creator.spec.js

@@ -24,7 +24,7 @@ describe('Tag Generator Page (Tag Creator)', () => {
   ];
 
   beforeEach(() => {
-    cy.intercept('https://api.civictechindex.org/api/organizations/').as(
+    cy.intercept(`${Cypress.env('REACT_APP_API_URL')}/api/organizations/`).as(
       'getOrganizations'
     );
     cy.visit('/join-index');