diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000000..49c2e5ff02 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,32 @@ +version: 2.1 + +executors: + e2e-executor: + docker: + - image: cypress/browsers:node10.16.0-chrome76 + +jobs: + e2e: + executor: e2e-executor + steps: + - checkout + - run: + name: Copy base .env file + command: cp sample.env .env + - run: + name: Install node modules + command: npm install && npm run bootstrap + - run: + name: End 2 end test command + # Running `npm run e2e:ci` causes the circleci node to OOM + command: npm run e2e + +workflows: + version: 2 + tests: + jobs: + - e2e: + filters: + branches: + ignore: + - master \ No newline at end of file diff --git a/.gitignore b/.gitignore index d06ac4e350..8cb8cb2faf 100644 --- a/.gitignore +++ b/.gitignore @@ -109,6 +109,9 @@ coverage # nyc test coverage .nyc_output +# Cypress.io +cypress/videos + # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) .grunt diff --git a/.travis.yml b/.travis.yml index 67db1616dd..7573e14157 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,4 +33,3 @@ jobs: - stage: Unit and Integration tests script: npm test - diff --git a/client/package.json b/client/package.json index 5d8205c4bd..98353bca72 100644 --- a/client/package.json +++ b/client/package.json @@ -82,16 +82,18 @@ ], "license": "MIT", "scripts": { - "clean": "gatsby clean", "prebuild": "npm run build:workers && node ../tools/scripts/build/ensure-env.js", "build": "node --max_old_space_size=7168 node_modules/gatsby-cli build", "build:workers": "node --max_old_space_size=7168 node_modules/webpack-cli --env.production --config ./webpack-workers.js --progress", + "clean": "gatsby clean", "predevelop": "npm run prebuild", "develop": "node --inspect=0.0.0.0:9228 node_modules/gatsby-cli develop", "format:gatsby": "prettier-eslint --write --trailing-comma none --single-quote './gatsby-*.js'", "format:src": "prettier-eslint --write --trailing-comma none --single-quote './src/**/*.js'", "format:utils": "prettier-eslint --write --trailing-comma none --single-quote './utils/**/*.js'", "format": "npm run format:gatsby && npm run format:src && npm run format:utils", + "prestand-alone": "npm run prebuild", + "stand-alone": "gatsby develop", "serve": "gatsby serve", "test": "jest" }, diff --git a/client/src/components/Map/__snapshots__/Map.test.js.snap b/client/src/components/Map/__snapshots__/Map.test.js.snap index f5c5e1140b..cee46e039d 100644 --- a/client/src/components/Map/__snapshots__/Map.test.js.snap +++ b/client/src/components/Map/__snapshots__/Map.test.js.snap @@ -10,6 +10,7 @@ exports[` snapshot: Map 1`] = ` >