Merge branch 'master' into disable-cypress-retries

deployment/bare_metal/setup.md

@@ -234,7 +234,8 @@ crontab -l
 
 This show all existing entries of the crontab for user `gradido`
 
-To install/add the cronjob for a daily backup at 3:00am please 
+To install/add the cronjob for a daily backup at 3:00am please,
+To install/add the cronjob for a daily klicktipp export at 4:00am please,
 
 Run:
 
@@ -244,4 +245,5 @@ crontab -e
 and insert the following line
 ```bash
 0 3 * * * ~/gradido/deployment/bare_metal/backup.sh
+0 4 * * * cd ~/gradido/backend/ && yarn klicktipp && cd
 ```

e2e-tests/cypress.config.ts

@@ -41,7 +41,6 @@ export default defineConfig({
   e2e: {
     specPattern: '**/*.feature',
     excludeSpecPattern: '*.js',
-    experimentalSessionAndOrigin: true,
     baseUrl: 'http://localhost:3000',
     chromeWebSecurity: false,
     defaultCommandTimeout: 10000,

e2e-tests/cypress/support/step_definitions/send_coin_steps.ts

@@ -1,4 +1,4 @@
-import { And, Then, When } from '@badeball/cypress-cucumber-preprocessor'
+import { Then, When } from '@badeball/cypress-cucumber-preprocessor'
 import { SendPage } from '../../e2e/models/SendPage'
 
 const sendPage = new SendPage()
@@ -12,7 +12,7 @@ When(
   },
 )
 
-And('the user submits the send form', () => {
+When('the user submits the send form', () => {
   sendPage.submit()
   cy.get(sendPage.confirmationBox).should('be.visible')
 })

e2e-tests/cypress/support/step_definitions/user_authentication_steps.ts

@@ -1,4 +1,4 @@
-import { When, And } from '@badeball/cypress-cucumber-preprocessor'
+import { When } from '@badeball/cypress-cucumber-preprocessor'
 import { ForgotPasswordPage } from '../../e2e/models/ForgotPasswordPage'
 import { LoginPage } from '../../e2e/models/LoginPage'
 import { ResetPasswordPage } from '../../e2e/models/ResetPasswordPage'
@@ -31,7 +31,7 @@ When('the user submits the credentials {string} {string}', (email: string, passw
 
 // password reset related
 
-And('the user navigates to the forgot password page', () => {
+When('the user navigates to the forgot password page', () => {
   loginPage.openForgotPasswordPage()
   cy.url().should('include', '/forgot-password')
 })
@@ -40,25 +40,25 @@ When('the user enters the e-mail address {string}', (email: string) => {
   forgotPasswordPage.enterEmail(email)
 })
 
-And('the user submits the e-mail form', () => {
+When('the user submits the e-mail form', () => {
   forgotPasswordPage.submitEmail()
   cy.get(forgotPasswordPage.successComponent).should('be.visible')
 })
 
-And('the user enters the password {string}', (password: string) => {
+When('the user enters the password {string}', (password: string) => {
   resetPasswordPage.enterNewPassword(password)
 })
 
-And('the user repeats the password {string}', (password: string) => {
+When('the user repeats the password {string}', (password: string) => {
   resetPasswordPage.repeatNewPassword(password)
 })
 
-And('the user submits the new password', () => {
+When('the user submits the new password', () => {
   resetPasswordPage.submitNewPassword()
   cy.get(resetPasswordPage.resetPasswordMessageBlock).should('be.visible')
 })
 
-And('the user clicks the sign in button', () => {
+When('the user clicks the sign in button', () => {
   resetPasswordPage.openSigninPage()
   cy.url().should('contain', '/login')
 })

e2e-tests/cypress/support/step_definitions/user_profile_change_password_steps.ts

@@ -1,10 +1,10 @@
-import { And, DataTable, When } from '@badeball/cypress-cucumber-preprocessor'
+import { DataTable, When } from '@badeball/cypress-cucumber-preprocessor'
 import { ProfilePage } from '../../e2e/models/ProfilePage'
 import { Toasts } from '../../e2e/models/Toasts'
 
 const profilePage = new ProfilePage()
 
-And('the user opens the change password menu', () => {
+When('the user opens the change password menu', () => {
   cy.get(profilePage.openChangePassword).click()
   cy.get(profilePage.newPasswordRepeatInput).should('be.visible')
   cy.get(profilePage.submitNewPasswordBtn).should('be.disabled')
@@ -18,7 +18,7 @@ When('the user fills the password form with:', (table: DataTable) => {
   cy.get(profilePage.submitNewPasswordBtn).should('be.enabled')
 })
 
-And('the user submits the password form', () => {
+When('the user submits the password form', () => {
   profilePage.submitPasswordForm()
 })
 

e2e-tests/cypress/support/step_definitions/user_registration_steps.ts

@@ -1,4 +1,4 @@
-import { And, When } from '@badeball/cypress-cucumber-preprocessor'
+import { When } from '@badeball/cypress-cucumber-preprocessor'
 import { RegistrationPage } from '../../e2e/models/RegistrationPage'
 
 const registrationPage = new RegistrationPage()
@@ -13,11 +13,11 @@ When(
   },
 )
 
-And('the user agrees to the privacy policy', () => {
+When('the user agrees to the privacy policy', () => {
   registrationPage.checkPrivacyCheckbox()
 })
 
-And('the user submits the registration form', () => {
+When('the user submits the registration form', () => {
   registrationPage.submitRegistrationForm()
   cy.get(registrationPage.RegistrationThanxHeadline).should('be.visible')
   cy.get(registrationPage.RegistrationThanxText).should('be.visible')

e2e-tests/package.json

@@ -18,20 +18,20 @@
     "lint": "eslint --max-warnings=0 --ext .js,.ts ."
   },
   "dependencies": {
-    "@badeball/cypress-cucumber-preprocessor": "^12.0.0",
+    "@badeball/cypress-cucumber-preprocessor": "^18.0.1",
     "@cypress/browserify-preprocessor": "^3.0.2",
     "@typescript-eslint/eslint-plugin": "^5.38.0",
     "@typescript-eslint/parser": "^5.38.0",
-    "cypress": "^12.7.0",
+    "cypress": "^12.16.0",
     "eslint": "^8.23.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-loader": "^4.0.2",
-    "eslint-plugin-cypress": "^2.12.1",
+    "eslint-plugin-cypress": "^2.13.3",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-promise": "^6.1.1",
     "jwt-decode": "^3.1.2",
     "prettier": "^2.7.1",
     "typescript": "^4.7.4"