diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4d30cda1f..0d627c2be 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -649,10 +649,10 @@ jobs: run: | cd e2e-tests/cypress/ yarn - yarn run cypress run --spec src/e2e/User.Authentication.feature,cypress/e2e/User.Authentication.ResetPassword.feature + yarn run cypress run --spec cypress/e2e/User.Authentication.feature,cypress/e2e/User.Authentication.ResetPassword.feature - name: End-to-end tests | if tests failed, upload screenshots if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }} uses: actions/upload-artifact@v3 with: name: cypress-screenshots - path: /home/runner/work/gradido/gradido/e2e-tests/cypress/tests/cypress/screenshots/ + path: /home/runner/work/gradido/gradido/e2e-tests/tests/screenshots/ diff --git a/e2e-tests/cypress/.gitignore b/e2e-tests/cypress/.gitignore index 1261bffa8..7ff29d6e8 100644 --- a/e2e-tests/cypress/.gitignore +++ b/e2e-tests/cypress/.gitignore @@ -1,4 +1,4 @@ node_modules/ -src/screenshots/ -src/videos/ -src/cucumber-messages.ndjson +cypress/screenshots/ +cypress/videos/ +cypress/cucumber-messages.ndjson diff --git a/e2e-tests/cypress/tsconfig.json b/e2e-tests/cypress/tsconfig.json index 4d863857b..c07e512cb 100644 --- a/e2e-tests/cypress/tsconfig.json +++ b/e2e-tests/cypress/tsconfig.json @@ -1,15 +1,16 @@ { "compilerOptions": { - "target": "es2016", + "target": "es6", "lib": ["es6", "dom"], "baseUrl": ".", "types": ["cypress", "node"], "strict": true, - "esModuleInterop": true, + "esModuleInterop": true, "moduleResolution": "node", "paths": { - "@/*": ["src/*"], - "@models/*": ["src/e2e/models/*"], + "@/*": ["cypress/*"], + "@models/*": ["cypress/e2e/models/*"], } }, + "include": ["**/*.ts"], }