From 1d34ebc488b6261dd60d6e6e21012b03dc28382b Mon Sep 17 00:00:00 2001 From: MLenterman Date: Mon, 13 Nov 2023 17:58:47 +0100 Subject: [PATCH] test: add save script to SoapUI project to clear property values --- CONTRIBUTING.md | 7 +++ e2e/SoapUI/zaakbrug-e2e-soapui-project.xml | 57 ++++++++++++------ .../zaakbrug-e2e-soapui-project.xml.zip | Bin 1617075 -> 0 bytes 3 files changed, 45 insertions(+), 19 deletions(-) delete mode 100644 e2e/SoapUI/zaakbrug-e2e-soapui-project.xml.zip diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0cffb37e..4fabe4d3b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,13 @@ Execute the following steps when bumping the Frank!Framework version: 8. Run the e2e testsuite by using the below Docker-Compose and configuration to validate the changes. You should only need `docker-compose -f ./docker-compose.zaakbrug.dev.yml -f ./docker-compose.openzaak.dev.yml up --build --force-recreate` for this. (TODO: Automate running of e2e tests in ci/cd). 9. Commit you changes on a branch with as message: `build(dependencies): bump f!f version to `. Create a PR to have you changes merged to master. +# Testing with SoapUI + +## Changes to the project file +Out-of-the-box SoapUI saves the dynamic properties set during execution of the tests to the project file. Having these dynamic properties value changes in the project file, makes it harder for Git to merge without a merge conflict. Git does not know the context of the changes and will simply see local and incoming changes to the same part of the project file, leading to a merge conflict that is hard to manually solve due to the sheer size of the projec t file. To combat this, we added a save script to the project that automatically clears all dynamic property values when saving the project, so that only functional changes end up in the project file. + +Unfortunatly Load and Save scripts are disabled by default in SoapUI. You can enable them by unchecking **"Disable the Load and Save scripts"** under `File -> Preferences -> Global Security Settings`. + # Docker-compose The docker-compose development environment is designed to be flexible and composable. This prevents the need for developers to run the entire stack eventhough their work requires only a small part of the stack. For this we make use of a docker-compose feature that merges a given array of docker-compose files together. Simply provide a `-f ./docker-compose..yml` argument for each docker-compose file you wish to include in the `docker-compose up`command. diff --git a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml index 6afe34a20..fb2fa46eb 100644 --- a/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml +++ b/e2e/SoapUI/zaakbrug-e2e-soapui-project.xml @@ -277325,7 +277325,7 @@ worden. Na het publiceren van een zaaktype zijn geen inhoudelijke wijzigingen meer mogelijk - ook niet de statustypen, eigenschappen... etc. Indien er na het publiceren nog wat gewijzigd moet worden, dan moet je een nieuwe versie aanmaken. -Publiceer het concept ZAAKTYPE.Content-TypeHEADERContent type van de verzoekinhoud.application/json200application/json400application/json401application/json403application/json404application/json406application/json410application/json415application/json429application/json500SEQUENTIALCatalogusCount0<entry key="Authorization" value="${#TestSuite#JwtToken}" xmlns="http://eviware.com/soapui/config"/>UTF-8${#Project#OpenZaakCatalogiApiRootUrl}http://localhost/catalogi/api/v1//catalogussen200No AuthorizationTransferCatalogusCountResponse01-zgw-getCatalogus$.countCatalogusCountPropertiesJSONPATHJSONPATHtrueIsThereCatalogusXPATH${Properties#CatalogusCount} = 104b-TransferExistingCatalogusUrl<entry key="Authorization" value="${#TestSuite#JwtToken}" xmlns="http://eviware.com/soapui/config"/>UTF-8${#Project#OpenZaakCatalogiApiRootUrl}{ +Publiceer het concept ZAAKTYPE.Content-TypeHEADERContent type van de verzoekinhoud.application/json200application/json400application/json401application/json403application/json404application/json406application/json410application/json415application/json429application/json500SEQUENTIALCatalogusCount<entry key="Authorization" value="${#TestSuite#JwtToken}" xmlns="http://eviware.com/soapui/config"/>UTF-8${#Project#OpenZaakCatalogiApiRootUrl}http://localhost/catalogi/api/v1//catalogussen200No AuthorizationTransferCatalogusCountResponse01-zgw-getCatalogus$.countCatalogusCountPropertiesJSONPATHJSONPATHtrueIsThereCatalogusXPATH${Properties#CatalogusCount} = 104b-TransferExistingCatalogusUrl<entry key="Authorization" value="${#TestSuite#JwtToken}" xmlns="http://eviware.com/soapui/config"/>UTF-8${#Project#OpenZaakCatalogiApiRootUrl}{ "domein": "ETESD", "rsin": "548746485", "contactpersoonBeheerNaam": "Marcel Lenterman", @@ -277480,7 +277480,7 @@ Publiceer het concept ZAAKTYPE. "volgnummer": 1, "richting": "intern", "statustype": null -}http://localhost/catalogi/api/v1//zaaktype-informatieobjecttypen$.zaaktype${#TestSuite#ZaakTypeMinimaregelingUrl}falsefalsefalseNo Authorization<xml-fragment/>${#TestSuite#InformatieObjectTypeBriefUrl}/publish$.omschrijvingBrieffalsefalsefalseNo AuthorizationContent-Typeapplication/jsonHEADERapplication/jsonAuthorization${#TestSuite#JwtToken}HEADER${#Project#JwtToken}<xml-fragment/>${#TestSuite#ZaakTypeMinimaregelingUrl}/publish$.identificatieB1026falsefalsefalseNo AuthorizationContent-Typeapplication/jsonHEADERapplication/jsonAuthorization${#TestSuite#JwtToken}HEADER${#Project#JwtToken}ZaakIdentificatieZK2023-00012DocumentIdentificatieDC2023-00005CheckedOutId872648cfd5f54df485de08213b32d2ecZaakUrlhttp://localhost:9001/zaken/api/v1/zaken/827b0c53-fccc-4c24-b90c-98277c632147DocumentUrlhttp://localhost:9001/documenten/api/v1/enkelvoudiginformatieobjecten/297f3432-5b9e-4d76-9ebc-083ad0a74f4d