Feat/connecta 297 caritas-rework playwright setup

.github/workflows/build.yml

@@ -70,7 +70,7 @@ jobs:
                   branch: ${{env.BRANCH}}
                   force: true
                   tags: true
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               if: failure()
               with:
                   name: cypress-videos

.github/workflows/dockerImage.yml

@@ -58,7 +58,7 @@ jobs:
                   echo "127.0.0.1 localhost" | sudo tee -a /etc/hosts
                   echo "fs.inotify.max_user_watches=524288" | sudo tee -a /etc/sysctl.conf
                   npm run test:build
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               with:
                   name: buildfiles
                   path: build/**/*
@@ -86,7 +86,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
             - name: Download buildfiles artifact
-              uses: actions/download-artifact@v2
+              uses: actions/download-artifact@v4
               with:
                   name: buildfiles
                   path: build

.github/workflows/playwright.yml

@@ -0,0 +1,30 @@
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+    - name: Install dependencies
+      run: npm ci
+    - name: Install Playwright Browsers
+      run: npx playwright install --with-deps
+    - name: Run Playwright tests
+      env:
+          USER_NAME: ${{ secrets.USERNAME }}
+          PASSWORD: ${{ secrets.PASSWORD }}
+      run: npx playwright test
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: playwright-report
+        path: playwright-report/
+        retention-days: 30

.github/workflows/storybook.yml

@@ -31,7 +31,7 @@ jobs:
             - run: npm ci
             - name: set env
               run: |
-                  echo REACT_APP_API_URL=https://dev.diakonie.dev.virtual-identity.com >> $GITHUB_ENV
+                  echo REACT_APP_API_URL=https://dev.caritas-rework.dev.virtual-identity.net >> $GITHUB_ENV
             - name: Run build
               run: npm run build-storybook
             - name: Setup Pages

.gitignore

@@ -37,3 +37,8 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 /.idea/
+node_modules/
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

.storybook/preview.tsx

@@ -4,7 +4,7 @@ import i18n from 'i18next';
 import { ThemeProvider } from '@mui/material';
 import { Preview } from '@storybook/react';
 import * as React from 'react';
-import theme from '../src/extensions/theme';
+import theme from '../src/resources/scripts/theme';
 import { config } from '../src/resources/scripts/config';
 import { LegalLinksProvider } from '../src/globalState/provider/LegalLinksProvider';
 import { init, FALLBACK_LNG } from '../src/i18n';

cypress/e2e/login.cy.ts

@@ -2,7 +2,8 @@ import {
 	closeWebSocketServer,
 	mockWebSocket,
 	startWebSocketServer
-} from '../support/websocket';
+} from '../../cypress/support/websocket';
+import { config } from '../../src/resources/scripts/config';
 
 describe('Login', () => {
 	before(() => {
@@ -14,6 +15,7 @@ describe('Login', () => {
 	});
 
 	beforeEach(() => {
+		cy.willReturn('frontend.settings', config);
 		mockWebSocket();
 	});
 
@@ -23,11 +25,9 @@ describe('Login', () => {
 		cy.get('#appRoot').should('exist');
 	});
 
-	it('displays the login at the root', () => {
+	it('displays the consultingtype page at the root', () => {
 		cy.visit('/');
-		cy.contains('Login');
-		cy.contains('Impressum');
-		cy.contains('Datenschutzerklärung');
+		cy.contains('Willkommen bei der Online-Beratung');
 	});
 
 	it('displays the login for resorts', () => {

cypress/fixtures/registration/agency.json

@@ -4,7 +4,6 @@
 	"postcode": "postcode",
 	"city": "city",
 	"description": "description",
-	"teamAgency": true,
 	"offline": false,
 	"consultingType": 1,
 	"topicIds": null

cypress/fixtures/registration/consultingType.json

@@ -19,12 +19,10 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": true,
-	"isAnonymousConversationAllowed": true,
 	"isSetEmailAllowed": true,
 	"slug": "suchtberatung",
 	"languageFormal": true,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": true,
 		"whiteSpotAgencyId": 100
@@ -46,20 +44,12 @@
 		"relation": true,
 		"state": false
 	},
-	"initializeFeedbackChat": false,
 	"roles": {
 		"consultant": {
 			"main": ["consultant"],
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"welcomeScreen": {
 		"anonymous": {

cypress/fixtures/service.agencies.json

@@ -5,7 +5,6 @@
 		"postcode": "postcode",
 		"city": "city",
 		"description": "description",
-		"teamAgency": true,
 		"offline": false,
 		"consultingType": 1,
 		"url": "url",

cypress/fixtures/service.consultingtypes.addiction.json

@@ -19,12 +19,10 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": true,
-	"isAnonymousConversationAllowed": true,
 	"isSetEmailAllowed": true,
 	"slug": "suchtberatung",
 	"languageFormal": true,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": true,
 		"whiteSpotAgencyId": 100
@@ -46,20 +44,12 @@
 		"relation": true,
 		"state": false
 	},
-	"initializeFeedbackChat": false,
 	"roles": {
 		"consultant": {
 			"main": ["consultant"],
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"welcomeScreen": {
 		"anonymous": {

cypress/fixtures/service.consultingtypes.emigration.json

@@ -21,12 +21,10 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": true,
-	"isAnonymousConversationAllowed": true,
 	"isSetEmailAllowed": true,
 	"slug": "rw-auswanderung",
 	"languageFormal": true,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": true,
 		"whiteSpotAgencyId": 1731
@@ -43,20 +41,12 @@
 	"sendFurtherStepsMessage": true,
 	"sendSaveSessionDataMessage": true,
 	"sessionDataInitializing": {},
-	"initializeFeedbackChat": false,
 	"roles": {
 		"consultant": {
 			"main": ["consultant"],
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": false,
 	"welcomeScreen": {
 		"anonymous": {

cypress/fixtures/service.consultingtypes.pregnancy.json

@@ -19,13 +19,11 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": true,
-	"isAnonymousConversationAllowed": true,
 	"isVideoCallAllowed": true,
 	"isSetEmailAllowed": true,
 	"slug": "suchtberatung",
 	"languageFormal": true,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": true,
 		"whiteSpotAgencyId": 100
@@ -47,20 +45,12 @@
 		"relation": true,
 		"state": false
 	},
-	"initializeFeedbackChat": false,
 	"roles": {
 		"consultant": {
 			"main": ["consultant"],
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"welcomeScreen": {
 		"anonymous": {

cypress/fixtures/service.consultingtypes.u25.json

@@ -23,12 +23,10 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": false,
-	"isAnonymousConversationAllowed": false,
 	"isSetEmailAllowed": false,
 	"slug": "u25",
 	"languageFormal": false,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": false
 	},
@@ -50,20 +48,12 @@
 		"relation": false,
 		"state": true
 	},
-	"initializeFeedbackChat": true,
 	"roles": {
 		"consultant": {
 			"main": ["consultant", "u25-consultant", "u25-main-consultant"],
 			"peer": ["consultant", "u25-consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"requiredComponents": {
 		"age": {

cypress/fixtures/service.users.data.json

@@ -13,7 +13,6 @@
 				"postcode": "12345",
 				"city": "city",
 				"description": "description",
-				"teamAgency": true,
 				"offline": false,
 				"consultingType": 0
 			}
@@ -23,11 +22,9 @@
 			"AUTHORIZATION_VIEW_AGENCY_CONSULTANTS",
 			"AUTHORIZATION_ASSIGN_CONSULTANT_TO_SESSION"
 		],
-		"hasAnonymousConversations": false,
 		"consultingTypes": null,
 		"formalLanguage": true,
 		"absent": false,
-		"inTeamAgency": true,
 		"languages": [],
 		"emailToggles": [
 			{
@@ -37,10 +34,6 @@
 			{
 				"name": "NEW_CHAT_MESSAGE_FROM_ADVICE_SEEKER",
 				"state": true
-			},
-			{
-				"name": "NEW_FEEDBACK_MESSAGE_FROM_ADVICE_SEEKER",
-				"state": true
 			}
 		]
 	},
@@ -58,17 +51,14 @@
 				"postcode": "12345",
 				"city": "city",
 				"description": "description",
-				"teamAgency": true,
 				"offline": false,
 				"consultingType": 2
 			}
 		],
 		"grantedAuthorities": ["AUTHORIZATION_CONSULTANT_DEFAULT"],
-		"hasAnonymousConversations": false,
 		"consultingTypes": null,
 		"formalLanguage": true,
-		"absent": false,
-		"inTeamAgency": true
+		"absent": false
 	},
 	{
 		"userId": "asker",
@@ -90,16 +80,13 @@
 					"postcode": "12345",
 					"city": "city",
 					"description": null,
-					"teamAgency": true,
 					"offline": false,
 					"consultingType": 1
 				}
 			},
 			"17": { "sessionData": null, "isRegistered": false, "agency": null }
 		},
-		"hasAnonymousConversations": false,
 		"formalLanguage": true,
-		"absent": false,
-		"inTeamAgency": false
+		"absent": false
 	}
 ]

cypress/fixtures/service.users.sessions.room.json

@@ -7,15 +7,11 @@
 		"postcode": "12345",
 		"language": "de",
 		"groupId": "someGroupId",
-		"feedbackGroupId": null,
-		"isPeerChat": false,
 		"askerRcId": "askerRcId",
 		"e2eLastMessage": null,
 		"lastMessage": null,
 		"messageDate": 0,
 		"messagesRead": false,
-		"feedbackRead": true,
-		"isTeamSession": false,
 		"registrationType": "REGISTERED",
 		"createDate": "2022-06-15T08:09:18Z",
 		"attachment": null,

cypress/support/commands/mockApi.ts

@@ -38,10 +38,6 @@ const defaultReturns = {
 			{
 				name: 'NEW_CHAT_MESSAGE_FROM_ADVICE_SEEKER',
 				state: false
-			},
-			{
-				name: 'NEW_FEEDBACK_MESSAGE_FROM_ADVICE_SEEKER',
-				state: false
 			}
 		]
 	},