Merge pull request #98 from CodeYourFuture/chore/e2e-v2

Backfill Cypress E2E tests then upgrade all dependencies

Author: textbook

.circleci/config.yml

@@ -24,34 +24,66 @@ commands:
               --paths /\*
 
 jobs:
+  test:
+    docker:
+      - image: cypress/base:16.17.1
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - yarn-dependencies-cypress-{{ checksum "yarn.lock" }}
+            - yarn-dependencies-cypress-
+      - run:
+          name: Install dependencies
+          command: yarn install --frozen-lockfile
+      - save_cache:
+          key: yarn-dependencies-cypress-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache
+      - run: yarn lint
+      - run: yarn e2e:prod
   build:
     docker:
-      - image: circleci/node:11.12
+      - image: cimg/node:16.17.1
     working_directory: ~/repo
     steps:
       - checkout
       - restore_cache:
           keys:
-            - yarn-dependencies-{{ checksum "package.json" }}
+            - yarn-dependencies-node-{{ checksum "yarn.lock" }}
+            - yarn-dependencies-node-
       - run:
           name: Install dependencies
-          command: yarn
+          command: yarn install --frozen-lockfile
       - save_cache:
-          key: yarn-dependencies-{{ checksum "package.json" }}
+          key: yarn-dependencies-node-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache
       - 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
+          command: yarn build
+          environment:
+            BUILD_PATH: 'qa'
+            GENERATE_SOURCEMAP: 'false'
+            REACT_APP_NODE_ENV: 'QA'
       - run:
           name: build staging
-          command: REACT_APP_NODE_ENV=STAGING yarn build:staging
+          command: yarn build
+          environment:
+            BUILD_PATH: 'staging'
+            GENERATE_SOURCEMAP: 'false'
+            REACT_APP_NODE_ENV: 'STAGING'
       - run:
           name: build production
-          command: REACT_APP_NODE_ENV=PRODUCTION yarn build:production
+          command: yarn build
+          environment:
+            BUILD_PATH: 'production'
+            GENERATE_SOURCEMAP: 'false'
+            REACT_APP_NODE_ENV: 'PRODUCTION'
       - persist_to_workspace:
           root: .
           paths:
@@ -79,7 +111,6 @@ jobs:
           to: 'forms.qa.codeyourfuture.io'
           cf_distribution_id: E2VFUDC8YCDBKS
 
-
   deploy_staging:
     docker:
       - image: circleci/python:3.6-jessie
@@ -124,8 +155,12 @@ workflows:
   version: 2
   test_and_deploy:
     jobs:
+      - test:
+          context: build
       - build:
           context: build
+          requires:
+            - test
       - deploy_qa:
           context: deployments_qa
           requires:

.eslintrc

@@ -8,6 +8,7 @@
 # testing
 /coverage
 /e2e/screenshots
+/e2e/videos
 
 # production
 /build
@@ -43,4 +44,3 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 .env
-package-lock.json

.gitignore

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn lint-staged

.husky/pre-commit

@@ -1,8 +1,9 @@
 {
+  "arrowParens": "avoid",
   "bracketSpacing": true,
+  "semi": false,
   "singleQuote": true,
   "tabWidth": 2,
-  "useTabs": false,
   "trailingComma": "none",
-  "semi": false
-}
+  "useTabs": false
+}

.prettierrc

@@ -0,0 +1,13 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:3000',
+    specPattern: 'e2e/integration/*.test.js',
+    supportFile: 'e2e/support/index.js'
+  },
+  fixturesFolder: 'e2e/fixtures',
+  screenshotsFolder: 'e2e/screenshots',
+  videosFolder: 'e2e/videos',
+  video: false
+})

config-overrides.js

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "plugin:cypress/recommended"
+  ]
+}

cypress.config.js

@@ -0,0 +1,8 @@
+{
+  "cities": [
+    {
+      "_id": "123abc",
+      "name": "London"
+    }
+  ]
+}