Merge pull request #89 from CodeYourFuture/staging

Merge QA config and Capgemini employer issue into Production

Author: textbook

.circleci/config.yml

@@ -43,6 +43,9 @@ jobs:
       - run:
           name: Set env variables
           command: echo 'export VERSION=$(echo $CIRCLE_SHA1 | cut -c -7)' >> $BASH_ENV
+      - run:
+          name: build qa
+          command: REACT_APP_NODE_ENV=QA yarn build:qa
       - run:
           name: build staging
           command: REACT_APP_NODE_ENV=STAGING yarn build:staging
@@ -52,15 +55,37 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
+            - qa
             - staging
             - production
 
+  deploy_qa:
+    docker:
+      - image: circleci/python:3.6-jessie
+    working_directory: ~/deploy
+    environment:
+      PUBLIC_URL: https://forms.qa.codeyourfuture.io
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: Set env variables
+          command: echo 'export VERSION=$(echo $CIRCLE_SHA1 | cut -c -7)' >> $BASH_ENV
+      - run:
+          name: Install awscli
+          command: sudo pip install awscli
+      - s3deploy:
+          dir: qa
+          to: 'forms.qa.codeyourfuture.io'
+          cf_distribution_id: E2VFUDC8YCDBKS
+
+
   deploy_staging:
     docker:
       - image: circleci/python:3.6-jessie
     working_directory: ~/deploy
     environment:
-      PUBLIC_URL: https://staging.forms.codeyourfuture.io
+      PUBLIC_URL: https://forms.staging.codeyourfuture.io
     steps:
       - attach_workspace:
           at: .
@@ -72,8 +97,8 @@ jobs:
           command: sudo pip install awscli
       - s3deploy:
           dir: staging
-          to: 'staging.forms.codeyourfuture.io'
-          cf_distribution_id: E3MJAA9E60TZUB
+          to: 'forms.staging.codeyourfuture.io'
+          cf_distribution_id: E1SJFMKKCNFUGI
 
   deploy_production:
     docker:
@@ -101,6 +126,14 @@ workflows:
     jobs:
       - build:
           context: build
+      - deploy_qa:
+          context: deployments_qa
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - qa
       - deploy_staging:
           context: deployments_staging
           requires:

e2e/integration/journey.test.js

@@ -34,7 +34,9 @@ const generateExpected = data => ({
   guidePeople: data.guidePeople || [],
   techSkill: data.techSkill || [],
   otherSkill: data.otherSkill || [],
-  userId: ''
+  userId: '',
+  agreeToReceiveCommunication: true,
+  agreeToTOU: true
 })
 
 it('can submit a minimal form', () => {

e2e/support/commands.js

@@ -23,7 +23,8 @@ Cypress.Commands.add('fillInitialForm', data => {
   }
 
   // submission
-  cy.get('[name="acknowledgement"]').click()
+  cy.get('[name="agreeToTOU"]').check()
+  cy.get('[name="agreeToReceiveCommunication"]').check()
   cy.get('button')
     .contains('Submit')
     .click()

package.json

@@ -34,6 +34,7 @@
   "scripts": {
     "start": "REACT_APP_NODE_ENV=LOCAL react-scripts start",
     "build": "react-scripts build && yarn run delete-maps",
+    "build:qa": "REACT_APP_NODE_ENV=QA react-scripts build && yarn run delete-maps && mv build qa",
     "build:staging": "REACT_APP_NODE_ENV=STAGING react-scripts build && yarn run delete-maps && mv build staging",
     "build:production": "REACT_APP_NODE_ENV=PRODUCTION react-scripts build && yarn run delete-maps && mv build production",
     "delete-maps": "yarn run delete-map-files && yarn run delete-references-to-map-files",

src/Components/forms/data.json

@@ -35,7 +35,9 @@
     { "name": "Transport and Logistics", "_id": "Transport and Logistics" },
     { "name": "Other", "_id": "Other" }
   ],
+
   "hearAboutCYFList": [
+    { "name": "Employer", "_id": "Employer" },
     { "name": "Search engine", "_id": "Search engine" },
     { "name": "Colleague or friend", "_id": "Colleague or friend" },
     { "name": "Conference", "_id": "Conference" },
@@ -45,11 +47,17 @@
     { "name": "Other", "_id": "Other" }
   ],
 
+  "employerList": [
+    { "name": "Capgemini", "_id": "Capgemini" },
+    { "name": "Other", "_id": "Other" }
+  ],
+
   "radioButtonList": [
     { "value": "None", "_id": "None" },
     { "value": "Some", "_id": "Some" },
     { "value": "Professional experience", "_id": "Professional experience" }
   ],
+
   "guidePeopleSkillList": [
     {
       "id": "98y439hf934",
@@ -64,6 +72,7 @@
       "label": "Help people learn public speaking"
     }
   ],
+
   "techSkillList": [
     {
       "id": "8976tygsbhj3e",

src/Components/forms/helper.js

@@ -10,6 +10,8 @@ export const initialState = {
   interestedInCYF: '',
   industry: '',
   hearAboutCYF: '',
+  hearAboutCYFFromEmployer: false,
+  employer: '',
   guidePeople: ListsData.guidePeopleSkillList,
   techSkill: ListsData.techSkillList,
   otherSkill: ListsData.otherSkillList,

src/Components/forms/index.js

@@ -100,6 +100,9 @@ class Forms extends Component {
         err: null
       })
     }
+    if (name === 'hearAboutCYF') {
+      this.setState({ hearAboutCYFFromEmployer: value === 'Employer' })
+    }
   }
 
   validateForm = values => {
@@ -154,6 +157,8 @@ class Forms extends Component {
       interestedInCYF,
       industry,
       hearAboutCYF,
+      hearAboutCYFFromEmployer,
+      employer,
       guidePeople,
       techSkill,
       otherSkill,
@@ -167,6 +172,7 @@ class Forms extends Component {
       lastName,
       email,
       cityId,
+      employer: hearAboutCYFFromEmployer ? employer : true,
       interestedInVolunteer,
       tel,
       agreeToTOU,
@@ -191,6 +197,7 @@ class Forms extends Component {
         interestedInCYF,
         industry,
         hearAboutCYF,
+        employer: hearAboutCYFFromEmployer ? employer : '',
         guidePeople: filterEmptyValue(guidePeople),
         techSkill: filterEmptyValue(techSkill),
         otherSkill: filterEmptyValue(otherSkill),

src/Components/forms/inputs/index.js

@@ -24,10 +24,12 @@ export default class VolunteerForm extends Component {
       interestedInCYF,
       industry,
       hearAboutCYF,
+      hearAboutCYFFromEmployer,
       onChangeCheckList,
       guidePeople,
       techSkill,
-      otherSkill
+      otherSkill,
+      employer
     } = this.props
 
     return (
@@ -109,6 +111,7 @@ export default class VolunteerForm extends Component {
           isEmpty={errors.industry}
           label="What industry are you in?"
         />
+
         <DropDown
           onChange={onChange}
           value={hearAboutCYF}
@@ -117,6 +120,16 @@ export default class VolunteerForm extends Component {
           isEmpty={errors.hearAboutCYF}
           label="Where did you hear about Code Your Future?"
         />
+        {hearAboutCYFFromEmployer && (
+          <DropDown
+            onChange={onChange}
+            value={employer}
+            name="employer"
+            arrayList={ListsData.employerList}
+            isEmpty={errors.employer}
+            label="Who is your employer? *"
+          />
+        )}
         <span className="contact-interested">
           <span>
             What would you like help Code Your Future with, and what is your

src/config.js

@@ -5,6 +5,8 @@ export const domain = () => {
   switch (env) {
     case 'LOCAL':
       return 'http://localhost:3001'
+    case 'QA':
+      return 'https://cyf-api.qa.codeyourfuture.io'
     case 'STAGING':
       return 'https://cyf-api.staging.codeyourfuture.io'
     case 'PRODUCTION':