Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: add zaakbrug app credentials automatically and replace manual catalog import with add&delete calls in testcase setup and teardown #174

Merged
merged 24 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bd39b1e
fix: insertAuth added to create zaagbrug app in db
Oct 18, 2023
2e51ce0
fix: insertAuth is mounted to open-zaak volumes
Oct 18, 2023
70cf2ea
openapi.yaml of catalogAPI imported into SoapUI
Oct 18, 2023
a1a054a
test:post catalog zaaktype and resultaatType added
Oct 23, 2023
ba67061
test: assertion added to postCatalog
Oct 23, 2023
fa0ad57
test: tear down steps have been added
Oct 24, 2023
60d8952
test: assertions added to setUp and tearDown steps
Oct 24, 2023
e9b2ae4
test:catalogusUrl prop is moved to TestSuite level
Oct 24, 2023
f0a7ee8
test: roltype and statustype added
Oct 25, 2023
e54760d
test: cataloguUrl moved to Properties in testCase
Oct 25, 2023
38699d8
test:setUp and tearDown steps added to 2ndTestCase
Oct 26, 2023
2f7a525
test: setUp and tearDown steps added to testCase3
Oct 26, 2023
e672ac2
test:add newTestCase to createZaakTypeAndSubTypes
Oct 27, 2023
53e5eff
test:setUp and TearDown steps added to 5. testcase
Oct 27, 2023
00b0122
test: setUp and tearDown steps added to 6.testCase
Oct 29, 2023
2231e50
test: setUp and tearDown steps for Gidso testCase
Oct 31, 2023
2de0020
test: setUp steps added to TestCase Suites4
Oct 31, 2023
a02b2ad
test: teardown steps for testCase Zorgverzekering
Oct 31, 2023
81012f7
test: testcases reorganized
Nov 3, 2023
bbc1924
test: test steps reorginised
Nov 6, 2023
ad0aef5
test: fixed failing test case
Nov 7, 2023
a65d1cd
test: rolType omscGeneriek updated
Nov 9, 2023
588c46f
test: disabled testCase
Nov 10, 2023
f05a2b8
test: add save script to SoapUI project to clear property values
MLenterman Nov 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <new tag>`. 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.<application>.yml` argument for each docker-compose file you wish to include in the `docker-compose up`command.

Expand Down
2 changes: 2 additions & 0 deletions docker-compose.openzaak.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
- open-zaak-db:/var/lib/postgresql/data
networks:
- open-zaak-backend
- zaakbrug-stack
ports:
- 5432

Expand Down Expand Up @@ -55,6 +56,7 @@ services:
volumes: &open-zaak-volumes
- open-zaak-media:/app/media
- open-zaak-private-media:/app/private-media
- ./docker/open-zaak:/app/fixtures
depends_on:
- open-zaak-db
- open-zaak-redis
Expand Down
20 changes: 20 additions & 0 deletions docker/open-zaak/insertAuth.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"model": "authorizations.applicatie",
"pk": 1,
"fields": {
"uuid": "4223b169-ebc7-4410-900f-0ea2bf75dd83",
"client_ids": "[\"ZaakBrug\"]",
"label": "ZaakBrug",
"heeft_alle_autorisaties": true
}
},
{
"model": "vng_api_common.jwtsecret",
"pk": 1,
"fields": {
"identifier": "ZaakBrug",
"secret": "secret1234"
}
}
]
Loading
Loading