diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f9cab6..eb8a9f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - setup - lint + - build - test - publish - deploy @@ -8,6 +9,7 @@ stages: cache: paths: - node_modules/ + - dist/ setup: image: node:12 @@ -27,6 +29,12 @@ sass:lint: script: - npm run lint:sass +ts:build: + image: node:12 + stage: build + script: + - npm run build + # test:unit: # image: node:12 # stage: test diff --git a/package.json b/package.json index 90167a8..fa2c557 100644 --- a/package.json +++ b/package.json @@ -32,17 +32,16 @@ "serve": "node dist/js/server.js", "start-prod": "npm run build && npm run serve", "mock-backend": "json-server --watch db.json -H 0.0.0.0 -p 1234", - "test": "npm-run-all lint test:e2e:verbose", - "test:e2e": "API_URL=http://web.sik.party:8000/api npm-run-all -s build test:e2e:run", + "test": "API_URL=http://web.sik.party:8000/api npm run test:e2e:verbose", + "test:e2e": " npm-run-all -p -r serve test:e2e:testcafe", "test:e2e:verbose": "npm-run-all -p -r serve test:e2e:testcafe:verbose", - "test:e2e:run": "npm-run-all -p -r serve test:e2e:testcafe", "test:e2e:testcafe": "testcafe -S -s 'tests/testcafe/screenshots' --app-init-delay 2000 chrome:headless tests/testcafe", "test:e2e:testcafe:verbose": "testcafe -S -s 'tests/testcafe/screenshots' --app-init-delay 2000 chrome tests/testcafe", "plop": "plop" }, "husky": { "hooks": { - "pre-push": "npm run test" + "pre-push": "npm-run-all -s lint build test" } }, "devDependencies": {