Merge branch 'change-test-browser' into 'master'

build: allow test browser to be configured with environment var

See merge request !45

.gitlab-ci.yml

@@ -56,6 +56,7 @@ test:e2e:
   stage: test
   variables:
     GIT_STRATEGY: none
+    BROWSER: chrome:headless --no-sandbox
     # setup data for postgres image
     POSTGRES_USER: test
     POSTGRES_PASSWORD: pw
@@ -68,7 +69,7 @@ test:e2e:
   script:
     - cd ${HOME}
     # specify host here else it confuses the linked postgres image
-    - PGHOST=postgres npm run test:e2e:ci
+    - PGHOST=postgres npm run test:e2e
 
 push:latest:
   image: docker:latest

package.json

@@ -34,8 +34,7 @@
     "start:styleguide": "docker-compose run --no-deps -p 6060:6060 app yarn run styleguide",
     "styleguide": "styleguidist server",
     "test": "jest",
-    "test:e2e": "NODE_ENV=test testcafe chrome 'test/**/*.e2e.js'",
-    "test:e2e:ci": "testcafe 'chrome:headless --no-sandbox' 'test/**/*.e2e.js'"
+    "test:e2e": "NODE_ENV=test testcafe \"${BROWSER:-chrome}\" 'test/**/*.e2e.js'"
   },
   "lint-staged": {
     "*.css": "stylelint",