diff --git a/cypress/integration/globalTests/indexSearch.ts b/cypress/integration/globalTests/indexSearch.ts index 2ec4c2d088e2ae667a80b04fed4d90cd4d604486..49f0d905fdd6950954f66da7c67d4f14940f8c5e 100644 --- a/cypress/integration/globalTests/indexSearch.ts +++ b/cypress/integration/globalTests/indexSearch.ts @@ -1,12 +1,16 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Index Search", () => { - it("Should find a specific company in the index search component", () => + it([Tag.DEFAULT], "Should find a specific company in the index search component", () => { cy.login(); cy.searchIndex("meineFirma"); }); - it("Should search for a company in the indexsearch and open the 'show more' context", () => + it([Tag.DEFAULT], "Should search for a company in the indexsearch and open the 'show more' context", () => { cy.login(); cy.openIndexResult("Bucher"); diff --git a/cypress/integration/globalTests/login.ts b/cypress/integration/globalTests/login.ts index 86eb61c9825f5dbc20103034cf020be8ad98a9ca..8b24210f573708e7f4913bcaec517f86693f1e57 100644 --- a/cypress/integration/globalTests/login.ts +++ b/cypress/integration/globalTests/login.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Login", () => { it([Tag.DEFAULT], "should login with admin account properly", () => { cy.login(); diff --git a/cypress/integration/globalTests/main_menu.ts b/cypress/integration/globalTests/main_menu.ts index 7594eacea4d6f9408152bf17118f4042ef0671dd..3047df22213d7a98109526872740358f92ed7ec2 100644 --- a/cypress/integration/globalTests/main_menu.ts +++ b/cypress/integration/globalTests/main_menu.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Admin-Menu", () => { it([Tag.DEFAULT], "Should show all Admin Menu-Points", () => { cy.login(); diff --git a/cypress/integration/singleTests/ActivityEdit_view/CreateActivity_AllFields.ts b/cypress/integration/singleTests/ActivityEdit_view/CreateActivity_AllFields.ts index b6a0b3ca5577896b3c0d35a4cd010a7a6e5878ec..b93f26ebc1fcc30c6f0d039a5f91cfcf0dd0346b 100644 --- a/cypress/integration/singleTests/ActivityEdit_view/CreateActivity_AllFields.ts +++ b/cypress/integration/singleTests/ActivityEdit_view/CreateActivity_AllFields.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Create Activity", () => { it([Tag.DEFAULT], "Should try to create an Activity, but as it is in the future it should not be possible", () => diff --git a/cypress/integration/singleTests/AttributeEdit_view/AttributeEdit_Person.ts b/cypress/integration/singleTests/AttributeEdit_view/AttributeEdit_Person.ts index 55be10cb818a721e64be9eb86e77b56d7c9fa935..f0f9c568f1b0fa7e741e79a4973003706f281b5e 100644 --- a/cypress/integration/singleTests/AttributeEdit_view/AttributeEdit_Person.ts +++ b/cypress/integration/singleTests/AttributeEdit_view/AttributeEdit_Person.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Add, change, cancel, delete Attribute in Person", () => { diff --git a/cypress/integration/singleTests/DocumentEdit_view/DocumentEdit_UploadOrg.ts b/cypress/integration/singleTests/DocumentEdit_view/DocumentEdit_UploadOrg.ts index 76137e2f0c724fccb8c2d11701bb45e373c02c02..c889e63110a6769287530ef38b8023d75f2dba59 100644 --- a/cypress/integration/singleTests/DocumentEdit_view/DocumentEdit_UploadOrg.ts +++ b/cypress/integration/singleTests/DocumentEdit_view/DocumentEdit_UploadOrg.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Upload and delete document from Organisation", () => { diff --git a/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation.ts b/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation.ts index b9dd9296a833140346b3ecb35cd83bbf46c8a959..28cceb08b69081e3b31beef0463499493609111e 100644 --- a/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation.ts +++ b/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Create Organisation", () => { it([Tag.DEFAULT], "Should create an organisation with all necessary fields", () => diff --git a/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation_AllFields.ts b/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation_AllFields.ts index 63028cb800b72772d9d86e1992cef83c5c3a86c0..cc9ad7ae7f8c0082afd84dce8422f79e926aa040 100644 --- a/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation_AllFields.ts +++ b/cypress/integration/singleTests/OrganisationEdit_view/CreateOrganisation_AllFields.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Create Organisation with all fields", () => { it([Tag.DEFAULT], "Should create an organisation with all fields", () => diff --git a/cypress/integration/singleTests/OrganisationFilter_view/OrganisationFilter_Group.ts b/cypress/integration/singleTests/OrganisationFilter_view/OrganisationFilter_Group.ts index bc1e01270939307cea5a895c8b8a6f5c6c98e671..f59e68f92b72b5755d417c93e158ef3165df7808 100644 --- a/cypress/integration/singleTests/OrganisationFilter_view/OrganisationFilter_Group.ts +++ b/cypress/integration/singleTests/OrganisationFilter_view/OrganisationFilter_Group.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Filter Organisation data", () => { diff --git a/cypress/integration/singleTests/OrganisationMain_view/OrganisationMain_openAndChangeTab.ts b/cypress/integration/singleTests/OrganisationMain_view/OrganisationMain_openAndChangeTab.ts index 38b2f78e9ec491404c304517d6d94753e664f863..cd2af68fe7b0c88fd3d32ede16361bc1c29c4bb8 100644 --- a/cypress/integration/singleTests/OrganisationMain_view/OrganisationMain_openAndChangeTab.ts +++ b/cypress/integration/singleTests/OrganisationMain_view/OrganisationMain_openAndChangeTab.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Open Organisation", () => { diff --git a/cypress/integration/singleTests/OrganisationPreview_view/OrganisationPreview_setFavorite.ts b/cypress/integration/singleTests/OrganisationPreview_view/OrganisationPreview_setFavorite.ts index b3878fcb73ada2fa5f424dc4afb4aeb23163f45e..894eb325b9a68224f30b2270ced03cea18d11e9c 100644 --- a/cypress/integration/singleTests/OrganisationPreview_view/OrganisationPreview_setFavorite.ts +++ b/cypress/integration/singleTests/OrganisationPreview_view/OrganisationPreview_setFavorite.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Set a favorite organisation", () => { it([Tag.DEFAULT], "Should set a favorite organisation without tag", () => diff --git a/cypress/integration/singleTests/PersonEdit_view/CreatePerson.ts b/cypress/integration/singleTests/PersonEdit_view/CreatePerson.ts index c28bd486a6db790f7faa50c5f43dda5d5478ed02..6323a91af4735dedea1aa7b0ef1d0649eb566854 100644 --- a/cypress/integration/singleTests/PersonEdit_view/CreatePerson.ts +++ b/cypress/integration/singleTests/PersonEdit_view/CreatePerson.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Create Person", () => { it([Tag.DEFAULT], "Should create a person with all necessary fields", () => diff --git a/cypress/integration/singleTests/PersonEdit_view/CreatePerson_AllFields.ts b/cypress/integration/singleTests/PersonEdit_view/CreatePerson_AllFields.ts index ed7dfc6f93c08d801f3f2dfd6dcc3f334cebe73b..949d6b465ff983188b48670c72a4eac2c4c58da3 100644 --- a/cypress/integration/singleTests/PersonEdit_view/CreatePerson_AllFields.ts +++ b/cypress/integration/singleTests/PersonEdit_view/CreatePerson_AllFields.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Create Person", () => { it([Tag.DEFAULT], "Should create a person with all fields", () => diff --git a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_AllTypes.ts b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_AllTypes.ts index bd2394c2c85f828b12d4f84fe436fb96be1184e0..6d4a910215928b11ee14c40d1cc17ca5bacbe032 100644 --- a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_AllTypes.ts +++ b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_AllTypes.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Filter Person data", () => { it([Tag.DEFAULT], "Should filter person surname correctly", () => diff --git a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_SpecificFilter.ts b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_SpecificFilter.ts index 8d1c0ff2089c8300535a17aed29a504b55fce8e8..c7da2ff35b21a30ce0fff5fd8a3e8daa9769a244 100644 --- a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_SpecificFilter.ts +++ b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_SpecificFilter.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Filter Person data - specific types with assertion", () => { it([Tag.DEFAULT], "Should filter person firstname correctly", () => diff --git a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_testButtons.ts b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_testButtons.ts index 6e90b308c286f5d06529eedf269367b064f90081..666fb39670aed35a6d94ad7d2bd82b1c363ec77e 100644 --- a/cypress/integration/singleTests/PersonFilter_view/PersonFilter_testButtons.ts +++ b/cypress/integration/singleTests/PersonFilter_view/PersonFilter_testButtons.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Press different buttons", () => { diff --git a/cypress/integration/singleTests/PersonMain_view/PersonMain_openAndEdit.ts b/cypress/integration/singleTests/PersonMain_view/PersonMain_openAndEdit.ts index 9926ec69f17171b1dba43c147105a41b06351bb7..2af813a186c7cb136ad879b21e28aa7e661548aa 100644 --- a/cypress/integration/singleTests/PersonMain_view/PersonMain_openAndEdit.ts +++ b/cypress/integration/singleTests/PersonMain_view/PersonMain_openAndEdit.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Filter Person data", () => { it([Tag.DEFAULT], "Should open main view and then edit", () => diff --git a/cypress/integration/singleTests/PersonPreview_view/PersonPreview_openAndCloseDrawer.ts b/cypress/integration/singleTests/PersonPreview_view/PersonPreview_openAndCloseDrawer.ts index 1df38dbb236dcf7c7e34ee10aedf2396d0d0e009..b18b222a09a620006ab46ff5ccd4b481744af48d 100644 --- a/cypress/integration/singleTests/PersonPreview_view/PersonPreview_openAndCloseDrawer.ts +++ b/cypress/integration/singleTests/PersonPreview_view/PersonPreview_openAndCloseDrawer.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Drawer actions person", () => { diff --git a/cypress/integration/singleTests/PersonPreview_view/PersonPreview_setFavorite.ts b/cypress/integration/singleTests/PersonPreview_view/PersonPreview_setFavorite.ts index d1e03765b4b26666d528999bd20adde50c4f8568..2e65af25b376d448f16e766c920c1cb1896b9e59 100644 --- a/cypress/integration/singleTests/PersonPreview_view/PersonPreview_setFavorite.ts +++ b/cypress/integration/singleTests/PersonPreview_view/PersonPreview_setFavorite.ts @@ -1,3 +1,7 @@ +beforeEach(() => { + cy.resetData(); +}) + describe("Set a favorite person", () => { it([Tag.DEFAULT], "Should set a favorite person without tag", () => diff --git a/cypress/support/index.ts b/cypress/support/index.ts index 70c186a1190ebdd3b13956c3cf90da9ea3221b72..63e9530e4e1c9c1d516f58b2504ec2a213a12ef8 100644 --- a/cypress/support/index.ts +++ b/cypress/support/index.ts @@ -7,6 +7,7 @@ import './view' import './actions' import './indexer' import './internal/taggingTests' +import './internal/resetData' import 'cypress-wait-until' import './enum.ts' diff --git a/cypress/support/internal/resetData.ts b/cypress/support/internal/resetData.ts new file mode 100644 index 0000000000000000000000000000000000000000..c6fbcf4e84988ea707472eee703d4e62a650de80 --- /dev/null +++ b/cypress/support/internal/resetData.ts @@ -0,0 +1,14 @@ +/// <reference types="cypress" /> + +declare namespace Cypress { + interface Chainable { + /** + * Executes the nodejs script reset:data + */ + resetData(): Chainable<any>; + } +} + +Cypress.Commands.add('resetData', (pSearchWord) => { + cy.exec("npm run reset:data", { failOnNonZeroExit: false }); +}); \ No newline at end of file diff --git a/package.json b/package.json index 519e3547782acf1d683145b5fc92e76ed8943750..da4a3544638ba5564e6adcf22ec18c349982b9a4 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "mochawesome-report-generator": "^5.2.0" }, "scripts": { - "create:reports": "mochawesome-merge cypress/reports/temp/*.json > cypress/reports/combined-report.json && marge --reportDir ./ --inline cypress/reports/combined-report.json" + "create:reports": "mochawesome-merge cypress/reports/temp/*.json > cypress/reports/combined-report.json && marge --reportDir ./ --inline cypress/reports/combined-report.json", + "reset:data": "run reset.sh" } }