diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 977a90167..859aa6424 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,7 +109,18 @@ jobs: with: start: yarn serve wait-on: http://localhost:8080/ - config_file: cypress.json + config-file: cypress.json spec: "tests/e2e/**/*" env: - CYPRESS_baseUrl: http://localhost:8080/ \ No newline at end of file + CYPRESS_baseUrl: http://localhost:8080/ + # after the test run completes + # store any screenshots + # NOTE: screenshots will be generated only if E2E test failed + # thus we store screenshots only on failures + # Alternative: create and commit an empty cypress/screenshots folder + # to always have something to upload + - uses: actions/upload-artifact@v1 + if: failure() + with: + name: cypress-screenshots + path: tests/e2e/screenshots diff --git a/.release-version b/.release-version index 2009c7dfa..fcdb2e109 100644 --- a/.release-version +++ b/.release-version @@ -1 +1 @@ -3.9.2 +4.0.0 diff --git a/jest.config.js b/jest.config.js index 9be4acf1c..11f5a67a1 100644 --- a/jest.config.js +++ b/jest.config.js @@ -23,7 +23,9 @@ module.exports = { ], moduleNameMapper: { '^@/(.*)$': '/src/$1', + '^@tests/(.*)$': '/tests/$1', }, + modulePaths: ['/tests/support/'], snapshotSerializers: [ 'jest-serializer-vue', // ], diff --git a/lefthook.yml b/lefthook.yml index 3bf891b23..7718c5311 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -17,3 +17,14 @@ pre-commit: eslint: glob: '*.{js,vue}' run: yarn lint {staged_files} + +fix: + parallel: false + commands: + prettier: + glob: '*.{js,vue}' + run: yarn prettier -write {staged_files} --ignore-unknown + + eslint: + glob: '*.{js,vue}' + run: yarn lint {staged_files} diff --git a/src/App.vue b/src/App.vue index ddd93cc01..fd9178add 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,9 +1,13 @@