digitalservicebund · Spencer6497 · Nov 22, 2024 · Nov 22, 2024 · Nov 22, 2024 · Nov 22, 2024
diff --git a/tests/fixtures/beratungshilfeFormularData.ts → ...df/__test__/beratungshilfeFormularData.ts b/tests/fixtures/beratungshilfeFormularData.ts → ...df/__test__/beratungshilfeFormularData.ts
diff --git a/app/domains/beratungshilfe/services/pdf/pdfForm/__test__/header.test.ts b/app/domains/beratungshilfe/services/pdf/pdfForm/__test__/header.test.ts
@@ -1,5 +1,5 @@
 import { getBeratungshilfeParameters } from "data/pdf/beratungshilfe/beratungshilfe.generated";
-import { happyPathData } from "tests/fixtures/beratungshilfeFormularData";
+import { happyPathData } from "~/domains/beratungshilfe/services/pdf/__test__/beratungshilfeFormularData";
 import { CheckboxValue } from "~/components/inputs/Checkbox";
 import type { BeratungshilfeFormularContext } from "~/domains/beratungshilfe/formular";
 import { gerbehAmtsgericht } from "~/services/gerichtsfinder/__test__/convertJsonDataTable.test";

diff --git a/.../fixtures/beratungshilfeVorabcheckData.ts → .../__test__/beratungshilfeVorabcheckData.ts b/.../fixtures/beratungshilfeVorabcheckData.ts → .../__test__/beratungshilfeVorabcheckData.ts
diff --git a/app/domains/beratungshilfe/vorabcheck/__test__/testcases.ts b/app/domains/beratungshilfe/vorabcheck/__test__/testcases.ts
@@ -1,7 +1,7 @@
 /* eslint sonarjs/no-duplicate-string: 0 */
 import { createMachine } from "xstate";
-import { happyPathData } from "tests/fixtures/beratungshilfeVorabcheckData";
 import type { TestCases } from "~/domains/__test__/TestCases";
+import { happyPathData } from "~/domains/beratungshilfe/vorabcheck/__test__/beratungshilfeVorabcheckData";
 import type { BeratungshilfeVorabcheckContext } from "~/domains/beratungshilfe/vorabcheck/context";
 import { beratungshilfeVorabcheckXstateConfig } from "~/domains/beratungshilfe/vorabcheck/xstateConfig";
 import type { FlowStateMachine } from "~/services/flow/server/buildFlowController";

diff --git a/.../factories/fluggastrechte/userDataMock.ts → ...hte/services/pdf/__test__/userDataMock.ts b/.../factories/fluggastrechte/userDataMock.ts → ...hte/services/pdf/__test__/userDataMock.ts
diff --git a/app/domains/fluggastrechte/services/pdf/sections/__test__/createBankInformation.test.ts b/app/domains/fluggastrechte/services/pdf/sections/__test__/createBankInformation.test.ts
@@ -1,5 +1,5 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,
 } from "tests/factories/mockPdfKit";

diff --git a/app/domains/fluggastrechte/services/pdf/sections/__test__/createFooter.test.ts b/app/domains/fluggastrechte/services/pdf/sections/__test__/createFooter.test.ts
@@ -1,5 +1,5 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,
 } from "tests/factories/mockPdfKit";

diff --git a/app/domains/fluggastrechte/services/pdf/sections/firstPage/__test__/createFirstPage.test.ts b/app/domains/fluggastrechte/services/pdf/sections/firstPage/__test__/createFirstPage.test.ts
@@ -1,5 +1,5 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,
 } from "tests/factories/mockPdfKit";

diff --git a/...gastrechte/services/pdf/sections/firstPage/__test__/createFlightCompensationClaim.test.ts b/...gastrechte/services/pdf/sections/firstPage/__test__/createFlightCompensationClaim.test.ts
@@ -1,5 +1,5 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,
 } from "tests/factories/mockPdfKit";

diff --git a/...s/fluggastrechte/services/pdf/sections/firstPage/__test__/createLocalCourtAndDate.test.ts b/...s/fluggastrechte/services/pdf/sections/firstPage/__test__/createLocalCourtAndDate.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...ains/fluggastrechte/services/pdf/sections/firstPage/__test__/createStatementClaim.test.ts b/...ains/fluggastrechte/services/pdf/sections/firstPage/__test__/createStatementClaim.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...uggastrechte/services/pdf/sections/firstPage/claimData/__test__/addAirlineDetails.test.ts b/...uggastrechte/services/pdf/sections/firstPage/claimData/__test__/addAirlineDetails.test.ts
@@ -1,5 +1,5 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,
 } from "tests/factories/mockPdfKit";

diff --git a/...gastrechte/services/pdf/sections/firstPage/claimData/__test__/addPlaintiffDetails.test.ts b/...gastrechte/services/pdf/sections/firstPage/claimData/__test__/addPlaintiffDetails.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...rechte/services/pdf/sections/firstPage/claimData/__test__/addPlannedFlightDetails.test.ts b/...rechte/services/pdf/sections/firstPage/claimData/__test__/addPlannedFlightDetails.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...fluggastrechte/services/pdf/sections/firstPage/claimData/__test__/createClaimData.test.ts b/...fluggastrechte/services/pdf/sections/firstPage/claimData/__test__/createClaimData.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/app/domains/fluggastrechte/services/pdf/sections/reason/__test__/createReasonPage.test.ts b/app/domains/fluggastrechte/services/pdf/sections/reason/__test__/createReasonPage.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...luggastrechte/services/pdf/sections/reason/factsOfCases/__test__/addFlightDetails.test.ts b/...luggastrechte/services/pdf/sections/reason/factsOfCases/__test__/addFlightDetails.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...mains/fluggastrechte/services/pdf/sections/reason/factsOfCases/__test__/addReason.test.ts b/...mains/fluggastrechte/services/pdf/sections/reason/factsOfCases/__test__/addReason.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...ggastrechte/services/pdf/sections/reason/factsOfCases/__test__/createFactsOfCases.test.ts b/...ggastrechte/services/pdf/sections/reason/factsOfCases/__test__/createFactsOfCases.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...df/sections/reason/factsOfCases/compensationAmount/__test__/addCompensationAmount.test.ts b/...df/sections/reason/factsOfCases/compensationAmount/__test__/addCompensationAmount.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...ices/pdf/sections/reason/factsOfCases/compensationAmount/__test__/addDistanceInfo.test.ts b/...ices/pdf/sections/reason/factsOfCases/compensationAmount/__test__/addDistanceInfo.test.ts
@@ -1,5 +1,5 @@
 import { Result } from "true-myth";
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...f/sections/reason/factsOfCases/compensationAmount/__test__/addMultiplePersonsInfo.test.ts b/...f/sections/reason/factsOfCases/compensationAmount/__test__/addMultiplePersonsInfo.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...sections/reason/factsOfCases/compensationAmount/__test__/addOtherDetailsItinerary.test.ts b/...sections/reason/factsOfCases/compensationAmount/__test__/addOtherDetailsItinerary.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...ces/pdf/sections/reason/factsOfCases/compensationAmount/__test__/addWitnessesInfo.test.ts b/...ces/pdf/sections/reason/factsOfCases/compensationAmount/__test__/addWitnessesInfo.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...rvices/pdf/sections/reason/factsOfCases/detailedReason/__test__/addDetailedReason.test.ts b/...rvices/pdf/sections/reason/factsOfCases/detailedReason/__test__/addDetailedReason.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...rvices/pdf/sections/reason/factsOfCases/detailedReason/__test__/addFlightTextArea.test.ts b/...rvices/pdf/sections/reason/factsOfCases/detailedReason/__test__/addFlightTextArea.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...s/pdf/sections/reason/factsOfCases/detailedReason/__test__/addMultiplePersonsText.test.ts b/...s/pdf/sections/reason/factsOfCases/detailedReason/__test__/addMultiplePersonsText.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/.../fluggastrechte/services/pdf/sections/reason/factsOfCases/table/__test__/addTable.test.ts b/.../fluggastrechte/services/pdf/sections/reason/factsOfCases/table/__test__/addTable.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...echte/services/pdf/sections/reason/legalAssessment/__test__/createLegalAssessment.test.ts b/...echte/services/pdf/sections/reason/legalAssessment/__test__/createLegalAssessment.test.ts
@@ -1,4 +1,4 @@
-import { userDataMock } from "tests/factories/fluggastrechte/userDataMock";
+import { userDataMock } from "~/domains/fluggastrechte/services/pdf/__test__/userDataMock";
 import {
   mockPdfKitDocument,
   mockPdfKitDocumentStructure,

diff --git a/...s/fixtures/geldEinklagenVorabcheckData.ts → ...k/__test__/geldEinklagenVorabcheckData.ts b/...s/fixtures/geldEinklagenVorabcheckData.ts → ...k/__test__/geldEinklagenVorabcheckData.ts
diff --git a/app/domains/geldEinklagen/vorabcheck/__test__/testcases.ts b/app/domains/geldEinklagen/vorabcheck/__test__/testcases.ts
@@ -1,7 +1,7 @@
 /* eslint sonarjs/no-duplicate-string: 0 */
 import { createMachine } from "xstate";
-import { happyPathData } from "tests/fixtures/geldEinklagenVorabcheckData";
 import type { TestCases } from "~/domains/__test__/TestCases";
+import { happyPathData } from "~/domains/geldEinklagen/vorabcheck/__test__/geldEinklagenVorabcheckData";
 import type { GeldEinklagenVorabcheckContext } from "~/domains/geldEinklagen/vorabcheck/context";
 import geldEinklagenFlow from "~/domains/geldEinklagen/vorabcheck/flow.json";
 import { guards } from "~/domains/geldEinklagen/vorabcheck/guards";

diff --git a/...ixtures/prozesskostenhilfeFormularData.ts → ..._test__/prozesskostenhilfeFormularData.ts b/...ixtures/prozesskostenhilfeFormularData.ts → ..._test__/prozesskostenhilfeFormularData.ts
diff --git a/app/domains/prozesskostenhilfe/formular/__test__/testcases.ts b/app/domains/prozesskostenhilfe/formular/__test__/testcases.ts
@@ -1,5 +1,5 @@
 import { createMachine } from "xstate";
-import { happyPathData } from "tests/fixtures/prozesskostenhilfeFormularData";
+import { happyPathData } from "~/domains/prozesskostenhilfe/formular/__test__/prozesskostenhilfeFormularData";
 import type { TestCases } from "~/domains/__test__/TestCases";
 import {
   prozesskostenhilfeFormular,

diff --git a/...domains/prozesskostenhilfe/formular/finanzielleAngaben/einkuenfte/__test__/guards.test.ts b/...domains/prozesskostenhilfe/formular/finanzielleAngaben/einkuenfte/__test__/guards.test.ts
@@ -1,4 +1,4 @@
-import { happyPathData } from "tests/fixtures/prozesskostenhilfeFormularData";
+import { happyPathData } from "~/domains/prozesskostenhilfe/formular/__test__/prozesskostenhilfeFormularData";
 import { CheckboxValue } from "~/components/inputs/Checkbox";
 import { finanzielleAngabeEinkuenfteGuards as guards } from "~/domains/prozesskostenhilfe/formular/finanzielleAngaben/einkuenfte/guards";
 

diff --git a/...stenhilfe/services/pdf/pdfForm/E_bruttoEinnahmen/__test__/bruttoEinnahmen_eigenes.test.ts b/...stenhilfe/services/pdf/pdfForm/E_bruttoEinnahmen/__test__/bruttoEinnahmen_eigenes.test.ts
@@ -1,7 +1,7 @@
 import { faker } from "@faker-js/faker";
 import type { ProzesskostenhilfePDF } from "data/pdf/prozesskostenhilfe/prozesskostenhilfe.generated";
 import { getProzesskostenhilfeParameters } from "data/pdf/prozesskostenhilfe/prozesskostenhilfe.generated";
-import { createFinancialEntry } from "tests/fixtures/prozesskostenhilfeFormularData";
+import { createFinancialEntry } from "~/domains/prozesskostenhilfe/formular/__test__/prozesskostenhilfeFormularData";
 import { CheckboxValue } from "~/components/inputs/Checkbox";
 import { SEE_IN_ATTACHMENT_DESCRIPTION } from "~/services/pdf/attachment";
 import {

diff --git a/...stenhilfe/services/pdf/pdfForm/E_bruttoEinnahmen/__test__/bruttoEinnahmen_partner.test.ts b/...stenhilfe/services/pdf/pdfForm/E_bruttoEinnahmen/__test__/bruttoEinnahmen_partner.test.ts
@@ -1,7 +1,7 @@
 import { faker } from "@faker-js/faker";
 import type { ProzesskostenhilfePDF } from "data/pdf/prozesskostenhilfe/prozesskostenhilfe.generated";
 import { getProzesskostenhilfeParameters } from "data/pdf/prozesskostenhilfe/prozesskostenhilfe.generated";
-import { createFinancialEntry } from "tests/fixtures/prozesskostenhilfeFormularData";
+import { createFinancialEntry } from "~/domains/prozesskostenhilfe/formular/__test__/prozesskostenhilfeFormularData";
 import { CheckboxValue } from "~/components/inputs/Checkbox";
 import { SEE_IN_ATTACHMENT_DESCRIPTION } from "~/services/pdf/attachment";
 import * as fillOutFunctions from "~/services/pdf/fillOutFunction";

diff --git a/app/domains/shared/formular/__test__/stringReplacements.test.ts b/app/domains/shared/formular/__test__/stringReplacements.test.ts
@@ -1,4 +1,4 @@
-import { happyPathData } from "tests/fixtures/beratungshilfeFormularData";
+import { happyPathData } from "~/domains/beratungshilfe/services/pdf/__test__/beratungshilfeFormularData";
 import {
   eigentumZusammenfassungShowPartnerschaftWarnings,
   getArrayIndexStrings,

diff --git a/doc/adr/0014-testing-strategy-assessment.md b/doc/adr/0014-testing-strategy-assessment.md
@@ -42,7 +42,7 @@ End-to-end tests validate the application's functionality from the user's perspe
 Examples:
 
 - Navigation for content pages (e.g. `/tests/e2e/pages/beratungshilfe.spec.ts` ensures the `/beratungshilfe` page is can be accessed and navigated).
-- Interactive forms (e.g. `/tests/e2e/flowPages/beratungshilfe/vorabcheck/beratungshilfe.vorabcheck.spec.ts` tests the complete traversal of the Beratungshilfe Vorabcheck flow).
+- Interactive forms (e.g. `/tests/e2e/domains/beratungshilfe/vorabcheck/beratungshilfe.vorabcheck.spec.ts` tests the complete traversal of the Beratungshilfe Vorabcheck flow).
 - Accessibility (e.g. `tests/e2e/pages/accessibilityScans.spec.ts` tests most of the content pages).
 - Application security (e.g. `/tests/e2e/common/csrf.spec.ts`, which validates CSRF token behavior across multiple tabs).
 

diff --git a/tests/e2e/common/csrf.spec.ts b/tests/e2e/common/csrf.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
-import { BeratungshilfeVorabcheck } from "tests/e2e/pom/BeratungshilfeVorabcheck";
-import { CookieSettings } from "tests/e2e/pom/CookieSettings";
+import { BeratungshilfeVorabcheck } from "tests/e2e/domains/beratungshilfe/vorabcheck/BeratungshilfeVorabcheck";
+import { CookieSettings } from "tests/e2e/domains/shared/CookieSettings";
 import { csrfCountMax } from "~/services/security/csrf/csrfKey";
 
 let vorabcheck: BeratungshilfeVorabcheck;

diff --git a/tests/e2e/common/hiddenfields.spec.ts b/tests/e2e/common/hiddenfields.spec.ts
@@ -1,5 +1,5 @@
 import { test, expect } from "@playwright/test";
-import { BeratungshilfeVorabcheck } from "tests/e2e/pom/BeratungshilfeVorabcheck";
+import { BeratungshilfeVorabcheck } from "tests/e2e/domains/beratungshilfe/vorabcheck/BeratungshilfeVorabcheck";
 
 const nextButtonName = "_action";
 

diff --git a/tests/e2e/common/userfeedback.vorabcheck.spec.ts b/tests/e2e/common/userfeedback.vorabcheck.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect, type Page } from "@playwright/test";
-import { BeratungshilfeVorabcheck } from "tests/e2e/pom/BeratungshilfeVorabcheck";
-import { CookieSettings } from "tests/e2e/pom/CookieSettings";
+import { BeratungshilfeVorabcheck } from "tests/e2e/domains/beratungshilfe/vorabcheck/BeratungshilfeVorabcheck";
+import { CookieSettings } from "tests/e2e/domains/shared/CookieSettings";
 
 let vorabcheck: BeratungshilfeVorabcheck;
 

diff --git a/tests/e2e/pom/BeratungshilfeFormular.ts → ...shilfe/formular/BeratungshilfeFormular.ts b/tests/e2e/pom/BeratungshilfeFormular.ts → ...shilfe/formular/BeratungshilfeFormular.ts
@@ -1,4 +1,4 @@
-import { Formular } from "./Formular";
+import { Formular } from "tests/e2e/domains/shared/Formular";
 
 export class BeratungshilfeFormular extends Formular {
   readonly url = "/beratungshilfe/antrag";

diff --git a/...gshilfe/formular/anwaltlicheVertretung.ts → ...gshilfe/formular/anwaltlicheVertretung.ts b/...gshilfe/formular/anwaltlicheVertretung.ts → ...gshilfe/formular/anwaltlicheVertretung.ts
@@ -1,8 +1,6 @@
-import { type Page } from "@playwright/test";
-import type { BeratungshilfeFormular } from "tests/e2e/pom/BeratungshilfeFormular";
+import type { BeratungshilfeFormular } from "tests/e2e/domains/beratungshilfe/formular/BeratungshilfeFormular";
 
 export async function startAnwaltlicheVertretung(
-  page: Page,
   beratungshilfeFormular: BeratungshilfeFormular,
 ) {
   // beratungshilfe/antrag/anwaltliche-vertretung/start

diff --git a/.../formular/beratungshilfe.formular.spec.ts → .../formular/beratungshilfe.formular.spec.ts b/.../formular/beratungshilfe.formular.spec.ts → .../formular/beratungshilfe.formular.spec.ts
@@ -1,6 +1,6 @@
 import { type Page, type Response, expect, test } from "@playwright/test";
-import { BeratungshilfeFormular } from "tests/e2e/pom/BeratungshilfeFormular";
-import { CookieSettings } from "tests/e2e/pom/CookieSettings";
+import { BeratungshilfeFormular } from "tests/e2e/domains/beratungshilfe/formular/BeratungshilfeFormular";
+import { CookieSettings } from "tests/e2e/domains/shared/CookieSettings";
 import { expectPageToBeAccessible } from "tests/e2e/util/expectPageToBeAccessible";
 import { startAnwaltlicheVertretung } from "./anwaltlicheVertretung";
 import { startFinanzielleAngabenEinkommen } from "./finanzielleAngabenEinkommen";
@@ -45,9 +45,9 @@ test("beratungshilfe formular can be traversed", async ({ page }) => {
   await beratungshilfeFormular.clickNext();
 
   await startGrundvoraussetzungen(page, beratungshilfeFormular);
-  await startAnwaltlicheVertretung(page, beratungshilfeFormular);
+  await startAnwaltlicheVertretung(beratungshilfeFormular);
   await startRechtsproblem(page, beratungshilfeFormular);
-  await startFinanzielleAngabenGrundsicherung(page, beratungshilfeFormular);
+  await startFinanzielleAngabenGrundsicherung(beratungshilfeFormular);
   await startPersoenlicheDaten(page, beratungshilfeFormular);
   await startAbgabe(page);
 });
@@ -59,9 +59,9 @@ test("invalid array index redirects to initial step of subflow", async ({
   await beratungshilfeFormular.clickNext();
 
   await startGrundvoraussetzungen(page, beratungshilfeFormular);
-  await startAnwaltlicheVertretung(page, beratungshilfeFormular);
+  await startAnwaltlicheVertretung(beratungshilfeFormular);
   await startRechtsproblem(page, beratungshilfeFormular);
-  await startFinanzielleAngabenEinkommen(page, beratungshilfeFormular);
+  await startFinanzielleAngabenEinkommen(beratungshilfeFormular);
   await startFinanzielleAngabenPartner(beratungshilfeFormular);
   await startFinanzielleAngabenKinder(page, beratungshilfeFormular);
   await page.goto(

diff --git a/...e/formular/finanzielleAngabenEinkommen.ts → ...e/formular/finanzielleAngabenEinkommen.ts b/...e/formular/finanzielleAngabenEinkommen.ts → ...e/formular/finanzielleAngabenEinkommen.ts
@@ -1,8 +1,6 @@
-import type { Page } from "@playwright/test";
-import type { BeratungshilfeFormular } from "tests/e2e/pom/BeratungshilfeFormular";
+import type { BeratungshilfeFormular } from "tests/e2e/domains/beratungshilfe/formular/BeratungshilfeFormular";
 
 export async function startFinanzielleAngabenEinkommen(
-  page: Page,
   beratungshilfeFormular: BeratungshilfeFormular,
 ) {
   // beratungshilfe/antrag/finanzielle-angaben/einkommen/start

diff --git a/...mular/finanzielleAngabenGrundsicherung.ts → ...mular/finanzielleAngabenGrundsicherung.ts b/...mular/finanzielleAngabenGrundsicherung.ts → ...mular/finanzielleAngabenGrundsicherung.ts
@@ -1,8 +1,6 @@
-import type { Page } from "@playwright/test";
-import type { BeratungshilfeFormular } from "tests/e2e/pom/BeratungshilfeFormular";
+import type { BeratungshilfeFormular } from "tests/e2e/domains/beratungshilfe/formular/BeratungshilfeFormular";
 
 export async function startFinanzielleAngabenGrundsicherung(
-  page: Page,
   beratungshilfeFormular: BeratungshilfeFormular,
 ) {
   // beratungshilfe/antrag/finanzielle-angaben/einkommen/start

diff --git a/...ngshilfe/formular/grundvoraussetzungen.ts → ...ngshilfe/formular/grundvoraussetzungen.ts b/...ngshilfe/formular/grundvoraussetzungen.ts → ...ngshilfe/formular/grundvoraussetzungen.ts
@@ -1,5 +1,5 @@
 import { type Page } from "@playwright/test";
-import type { BeratungshilfeFormular } from "tests/e2e/pom/BeratungshilfeFormular";
+import type { BeratungshilfeFormular } from "tests/e2e/domains/beratungshilfe/formular/BeratungshilfeFormular";
 import { expectPageToBeAccessible } from "tests/e2e/util/expectPageToBeAccessible";
 
 export async function startGrundvoraussetzungen(

diff --git a/...atungshilfe/formular/persoenlicheDaten.ts → ...atungshilfe/formular/persoenlicheDaten.ts b/...atungshilfe/formular/persoenlicheDaten.ts → ...atungshilfe/formular/persoenlicheDaten.ts
@@ -1,5 +1,5 @@
 import { type Page } from "@playwright/test";
-import type { BeratungshilfeFormular } from "tests/e2e/pom/BeratungshilfeFormular";
+import type { BeratungshilfeFormular } from "tests/e2e/domains/beratungshilfe/formular/BeratungshilfeFormular";
 import { expectPageToBeAccessible } from "tests/e2e/util/expectPageToBeAccessible";
 
 export async function startPersoenlicheDaten(

diff --git a/.../beratungshilfe/formular/rechtsproblem.ts → .../beratungshilfe/formular/rechtsproblem.ts b/.../beratungshilfe/formular/rechtsproblem.ts → .../beratungshilfe/formular/rechtsproblem.ts
@@ -1,5 +1,5 @@
 import { type Page } from "@playwright/test";
-import type { BeratungshilfeFormular } from "tests/e2e/pom/BeratungshilfeFormular";
+import type { BeratungshilfeFormular } from "tests/e2e/domains/beratungshilfe/formular/BeratungshilfeFormular";
 import { expectPageToBeAccessible } from "tests/e2e/util/expectPageToBeAccessible";
 
 export async function startRechtsproblem(

diff --git a/tests/e2e/pom/BeratungshilfeVorabcheck.ts → ...fe/vorabcheck/BeratungshilfeVorabcheck.ts b/tests/e2e/pom/BeratungshilfeVorabcheck.ts → ...fe/vorabcheck/BeratungshilfeVorabcheck.ts
@@ -1,4 +1,4 @@
-import { Vorabcheck } from "./Vorabcheck";
+import { Vorabcheck } from "tests/e2e/domains/shared/Vorabcheck";
 
 export class BeratungshilfeVorabcheck extends Vorabcheck {
   readonly url = "/beratungshilfe/vorabcheck";

diff --git a/...abcheck/beratungshilfe.vorabcheck.spec.ts → ...abcheck/beratungshilfe.vorabcheck.spec.ts b/...abcheck/beratungshilfe.vorabcheck.spec.ts → ...abcheck/beratungshilfe.vorabcheck.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
-import { BeratungshilfeVorabcheck } from "tests/e2e/pom/BeratungshilfeVorabcheck";
-import { CookieSettings } from "tests/e2e/pom/CookieSettings";
+import { BeratungshilfeVorabcheck } from "tests/e2e/domains/beratungshilfe/vorabcheck/BeratungshilfeVorabcheck";
+import { CookieSettings } from "tests/e2e/domains/shared/CookieSettings";
 import { expectPageToBeAccessible } from "tests/e2e/util/expectPageToBeAccessible";
 
 let vorabcheck: BeratungshilfeVorabcheck;

diff --git a/tests/e2e/pom/FluggastrechteFormular.ts → ...rechte/formular/FluggastrechteFormular.ts b/tests/e2e/pom/FluggastrechteFormular.ts → ...rechte/formular/FluggastrechteFormular.ts
@@ -1,4 +1,4 @@
-import { Formular } from "./Formular";
+import { Formular } from "tests/e2e/domains/shared/Formular";
 
 export class FluggastrechteFormular extends Formular {
   readonly url = "/fluggastrechte/formular";

diff --git a/.../formular/fluggastrechte.formular.spec.ts → .../formular/fluggastrechte.formular.spec.ts b/.../formular/fluggastrechte.formular.spec.ts → .../formular/fluggastrechte.formular.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
-import { FluggastrechteFormular } from "tests/e2e/pom/FluggastrechteFormular";
-import { FluggastrechteVorabcheck } from "tests/e2e/pom/FluggastrechteVorabcheck";
+import { FluggastrechteFormular } from "tests/e2e/domains/fluggastrechte/formular/FluggastrechteFormular";
+import { FluggastrechteVorabcheck } from "tests/e2e/domains/fluggastrechte/vorabcheck/FluggastrechteVorabcheck";
 import { startFluggastrechteFormular } from "./startFluggastrechteFormular";
 import { startFluggastrechteVorabcheckVerspaetung } from "../vorabcheck/vorabcheckVerspaetung";
 

diff --git a/...e/formular/startFluggastrechteFormular.ts → ...e/formular/startFluggastrechteFormular.ts b/...e/formular/startFluggastrechteFormular.ts → ...e/formular/startFluggastrechteFormular.ts
@@ -1,5 +1,5 @@
 import { type Page, expect } from "@playwright/test";
-import type { FluggastrechteFormular } from "tests/e2e/pom/FluggastrechteFormular";
+import type { FluggastrechteFormular } from "tests/e2e/domains/fluggastrechte/formular/FluggastrechteFormular";
 import { expectPageToBeAccessible } from "tests/e2e/util/expectPageToBeAccessible";
 import { today, toGermanDateFormat } from "~/util/date";
 

diff --git a/tests/e2e/pom/FluggastrechteVorabcheck.ts → ...te/vorabcheck/FluggastrechteVorabcheck.ts b/tests/e2e/pom/FluggastrechteVorabcheck.ts → ...te/vorabcheck/FluggastrechteVorabcheck.ts
@@ -1,4 +1,4 @@
-import { Vorabcheck } from "./Vorabcheck";
+import { Vorabcheck } from "tests/e2e/domains/shared/Vorabcheck";
 
 export class FluggastrechteVorabcheck extends Vorabcheck {
   readonly url = "/fluggastrechte/vorabcheck";

diff --git a/...abcheck/fluggastrechte.vorabcheck.spec.ts → ...abcheck/fluggastrechte.vorabcheck.spec.ts b/...abcheck/fluggastrechte.vorabcheck.spec.ts → ...abcheck/fluggastrechte.vorabcheck.spec.ts
@@ -1,10 +1,10 @@
 import { test, expect } from "@playwright/test";
+import { FluggastrechteVorabcheck } from "tests/e2e/domains/fluggastrechte/vorabcheck/FluggastrechteVorabcheck";
 import { startFluggastrechteVorabcheckAnnullierung } from "./vorabcheckAnnullierung";
 import { startFluggastrechteVorabcheckFunnelCheck } from "./vorabcheckFunnelCheck";
 import { startFluggastrechteVorabcheckNichtBefoerderung } from "./vorabcheckNichtBefoerderung";
 import { startFluggastrechteVorabcheckVerspaetung } from "./vorabcheckVerspaetung";
 import { startFluggastrechteVorabcheckVerspaetungNoJS } from "./vorabcheckVerspaetungNoJS";
-import { FluggastrechteVorabcheck } from "../../../pom/FluggastrechteVorabcheck";
 
 let vorabcheck: FluggastrechteVorabcheck;