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.

Sign up for GitHub

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

fix(network-shim): handle 304s from different scenarios in the same feature #261

Merged
merged 4 commits into from
Aug 23, 2021
Merged

fix(network-shim): handle 304s from different scenarios in the same feature #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33ef97b
fix(network-shim): handle 304s from different scenarios within a feature
HendrikThePendric Aug 19, 2021
2536e8e
chore: restore stubbing logic to original state
HendrikThePendric Aug 20, 2021
88442a5
fix: only use feature-name to uniquely identify a fixture (not scenario)
HendrikThePendric Aug 20, 2021
0ee35b7
chore: format generated files
HendrikThePendric Aug 20, 2021
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
14 changes: 7 additions & 7 deletions ...form-app/cypress/fixtures/network/37/creating_user_groups_with_intercept_and_fixture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"path": "/api/37/systemSettings/helpPageLink",
"testName": "Creating user groups with intercept and fixture -- Creating a user - intercept fixture",
"featureName": "Creating user groups with intercept and fixture",
"static": false,
"count": 1,
"nonDeterministic": false,
Expand All @@ -19,7 +19,7 @@
"responseBody": "{\"helpPageLink\":\"https://dhis2.github.io/dhis2-docs/master/en/user/html/dhis2_user_manual_en.html\"}",
"responseSize": 99,
"responseHeaders": {
"server": "nginx/1.19.3",
"server": "nginx/1.21.1",
"content-type": "application/json;charset=UTF-8",
"transfer-encoding": "chunked",
"connection": "keep-alive",
Expand All @@ -35,9 +35,9 @@
},
{
"path": "/api/37/userGroups",
"testName": "Creating user groups with intercept and fixture -- Creating a user - intercept fixture",
"featureName": "Creating user groups with intercept and fixture",
"static": false,
"count": 1,
"count": 2,
"nonDeterministic": false,
"method": "GET",
"requestBody": "",
Expand All @@ -50,10 +50,10 @@
"sec-fetch-mode": "cors"
},
"statusCode": 200,
"responseBody": "{\"pager\":{\"page\":1,\"pageCount\":2,\"total\":69,\"pageSize\":50,\"nextPage\":\"/37/userGroups?page=2\"},\"userGroups\":[{\"id\":\"ACqEyEykXw5\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"EDggDryeIQE\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"EZdoOzMxMfg\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"EiS2dmV3g9l\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"IcTNMsirK3l\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"Jl3ZjQ35gV3\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"Jx71IWpmULx\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"KveMla2WkFY\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"M1D5OMTzhVY\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"MU1ndR5wngH\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"Mq7feqpgtVf\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"PxLdKPgQqEe\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"Sh22UYzkjL4\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"TEZIw6ZwKqg\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"TdxdbuuzGPI\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"U3h4f4zTodc\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"U8Hk2IDvQc7\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"Uc8fKcOK9yf\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"UeKTu8YRA30\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"V70CXihjK4g\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"VjBD8pVfJn5\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"WtPEf9EQueT\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"XH0a1ZJLjSa\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"XtRO4gHGnq5\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"d7234rtN6iS\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"eQENaTFRfwf\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"hfL7zdMG0wV\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"hrP8MGV1H7Z\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"mheJov6QsE9\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"mzlqCvOvEKT\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"pBYWZIyFFed\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"q5e7TniPnfO\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"qmIidnVVY1I\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"spsCcIbg3SD\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"vNHyMXIbvBo\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"y2pl19uEHgf\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"yAE3qeDmPox\",\"displayName\":\"AAAAAAA_CREATED_IN_TEST\"},{\"id\":\"wl5cDMuUhmF\",\"displayName\":\"Administrators\"},{\"id\":\"vAvEltyXGbD\",\"displayName\":\"Africare HQ\"},{\"id\":\"ZoHNWQajIoe\",\"displayName\":\"Bo District M&E officers\"},{\"id\":\"th4S6ovwcr8\",\"displayName\":\"Bonthe District M&E Officers\"},{\"id\":\"wAAA1agEHin\",\"displayName\":\"Cape Town University Research Group\"},{\"id\":\"qlEhuAA77gc\",\"displayName\":\"EPI Stock Completeness Notification Recipients\"},{\"id\":\"ZrsVF7IJ93y\",\"displayName\":\"Family Health Partner\"},{\"id\":\"QYrzIjSfI8z\",\"displayName\":\"Feedback Message Recipients\"},{\"id\":\"Rg8wusV7QYi\",\"displayName\":\"HIV Program Coordinators\"},{\"id\":\"YCPJDwzbe8T\",\"displayName\":\"Kenya staff\"},{\"id\":\"jvrEwEJ2yZn\",\"displayName\":\"Malaria program\"},{\"id\":\"k3xzluFKVyw\",\"displayName\":\"Nairobi University Research Group\"},{\"id\":\"GZSvMCVowAx\",\"displayName\":\"Partner for Health International\"}]}",
"responseSize": 3206,
"responseBody": "{\"pager\":{\"page\":1,\"pageCount\":1,\"total\":31,\"pageSize\":50},\"userGroups\":[{\"id\":\"wl5cDMuUhmF\",\"displayName\":\"Administrators\"},{\"id\":\"vAvEltyXGbD\",\"displayName\":\"Africare HQ\"},{\"id\":\"ZoHNWQajIoe\",\"displayName\":\"Bo District M&E officers\"},{\"id\":\"th4S6ovwcr8\",\"displayName\":\"Bonthe District M&E Officers\"},{\"id\":\"wAAA1agEHin\",\"displayName\":\"Cape Town University Research Group\"},{\"id\":\"qlEhuAA77gc\",\"displayName\":\"EPI Stock Completeness Notification Recipients\"},{\"id\":\"ZrsVF7IJ93y\",\"displayName\":\"Family Health Partner\"},{\"id\":\"sZRhXMPbcWc\",\"displayName\":\"Family Planning Program Coordinators\"},{\"id\":\"QYrzIjSfI8z\",\"displayName\":\"Feedback Message Recipients\"},{\"id\":\"Rg8wusV7QYi\",\"displayName\":\"HIV Program Coordinators\"},{\"id\":\"YCPJDwzbe8T\",\"displayName\":\"Kenya staff\"},{\"id\":\"jvrEwEJ2yZn\",\"displayName\":\"Malaria program\"},{\"id\":\"k3xzluFKVyw\",\"displayName\":\"Nairobi University Research Group\"},{\"id\":\"GZSvMCVowAx\",\"displayName\":\"Partner for Health International\"},{\"id\":\"lFHP5lLkzVr\",\"displayName\":\"System administrators\"},{\"id\":\"hj0nnsVsPLU\",\"displayName\":\"TB Program Coordinators\"},{\"id\":\"L4XTzgbdza3\",\"displayName\":\"Wakiki\"},{\"id\":\"Iqfwd3j2qe5\",\"displayName\":\"World Health Program\"},{\"id\":\"GogLpGmkL0g\",\"displayName\":\"_DATASET_Child Health Program Manager\"},{\"id\":\"tH0GcNZZ1vW\",\"displayName\":\"_DATASET_Data entry clerk\"},{\"id\":\"w900PX10L7O\",\"displayName\":\"_DATASET_M and E Officer\"},{\"id\":\"B6JNeAQ6akX\",\"displayName\":\"_DATASET_Superuser\"},{\"id\":\"zz6XckBrLlj\",\"displayName\":\"_DATASET_System administrator (ALL)\"},{\"id\":\"M1Qre0247G3\",\"displayName\":\"_PROGRAM_Antenatal care program\"},{\"id\":\"H9XnHoWRKCg\",\"displayName\":\"_PROGRAM_Child Health Tracker\"},{\"id\":\"NTC8GjJ7p8P\",\"displayName\":\"_PROGRAM_Inpatient program\"},{\"id\":\"vRoAruMnNpB\",\"displayName\":\"_PROGRAM_MNCH / PNC (Adult Woman) program\"},{\"id\":\"gXpmQO6eEOo\",\"displayName\":\"_PROGRAM_Superuser\"},{\"id\":\"pBnkuih0c1K\",\"displayName\":\"_PROGRAM_System administrator (ALL)\"},{\"id\":\"Kk12LkEWtXp\",\"displayName\":\"_PROGRAM_TB program\"},{\"id\":\"z1gNAf2zUxZ\",\"displayName\":\"_PROGRAM_WHO MCH program\"}]}",
"responseSize": 2041,
"responseHeaders": {
"server": "nginx/1.19.3",
"server": "nginx/1.21.1",
"content-type": "application/json;charset=UTF-8",
"transfer-encoding": "chunked",
"connection": "keep-alive",
Expand Down
70 changes: 70 additions & 0 deletions examples/platform-app/cypress/fixtures/network/37/handles_304s_in_a_single_feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
[
{
"path": "/api/37/systemSettings/helpPageLink",
"featureName": "Handles 304s in a single feature",
"static": false,
"count": 2,
"nonDeterministic": false,
"method": "GET",
"requestBody": "",
"requestHeaders": {
"host": "localhost:8080",
"proxy-connection": "keep-alive",
"accept": "application/json",
"origin": "http://localhost:3000",
"sec-fetch-site": "same-site",
"sec-fetch-mode": "cors"
},
"statusCode": 200,
"responseBody": "{\"helpPageLink\":\"https://dhis2.github.io/dhis2-docs/master/en/user/html/dhis2_user_manual_en.html\"}",
"responseSize": 99,
"responseHeaders": {
"server": "nginx/1.21.1",
"content-type": "application/json;charset=UTF-8",
"transfer-encoding": "chunked",
"connection": "keep-alive",
"access-control-allow-credentials": "true",
"access-control-allow-origin": "http://localhost:3000",
"vary": "Origin",
"access-control-expose-headers": "ETag, Location",
"cache-control": "no-cache, private",
"x-content-type-options": "nosniff",
"x-xss-protection": "1; mode=block",
"x-frame-options": "SAMEORIGIN"
}
},
{
"path": "/api/37/userGroups",
"featureName": "Handles 304s in a single feature",
"static": false,
"count": 2,
"nonDeterministic": false,
"method": "GET",
"requestBody": "",
"requestHeaders": {
"host": "localhost:8080",
"proxy-connection": "keep-alive",
"accept": "application/json",
"origin": "http://localhost:3000",
"sec-fetch-site": "same-site",
"sec-fetch-mode": "cors"
},
"statusCode": 200,
"responseBody": "{\"pager\":{\"page\":1,\"pageCount\":1,\"total\":31,\"pageSize\":50},\"userGroups\":[{\"id\":\"wl5cDMuUhmF\",\"displayName\":\"Administrators\"},{\"id\":\"vAvEltyXGbD\",\"displayName\":\"Africare HQ\"},{\"id\":\"ZoHNWQajIoe\",\"displayName\":\"Bo District M&E officers\"},{\"id\":\"th4S6ovwcr8\",\"displayName\":\"Bonthe District M&E Officers\"},{\"id\":\"wAAA1agEHin\",\"displayName\":\"Cape Town University Research Group\"},{\"id\":\"qlEhuAA77gc\",\"displayName\":\"EPI Stock Completeness Notification Recipients\"},{\"id\":\"ZrsVF7IJ93y\",\"displayName\":\"Family Health Partner\"},{\"id\":\"sZRhXMPbcWc\",\"displayName\":\"Family Planning Program Coordinators\"},{\"id\":\"QYrzIjSfI8z\",\"displayName\":\"Feedback Message Recipients\"},{\"id\":\"Rg8wusV7QYi\",\"displayName\":\"HIV Program Coordinators\"},{\"id\":\"YCPJDwzbe8T\",\"displayName\":\"Kenya staff\"},{\"id\":\"jvrEwEJ2yZn\",\"displayName\":\"Malaria program\"},{\"id\":\"k3xzluFKVyw\",\"displayName\":\"Nairobi University Research Group\"},{\"id\":\"GZSvMCVowAx\",\"displayName\":\"Partner for Health International\"},{\"id\":\"lFHP5lLkzVr\",\"displayName\":\"System administrators\"},{\"id\":\"hj0nnsVsPLU\",\"displayName\":\"TB Program Coordinators\"},{\"id\":\"L4XTzgbdza3\",\"displayName\":\"Wakiki\"},{\"id\":\"Iqfwd3j2qe5\",\"displayName\":\"World Health Program\"},{\"id\":\"GogLpGmkL0g\",\"displayName\":\"_DATASET_Child Health Program Manager\"},{\"id\":\"tH0GcNZZ1vW\",\"displayName\":\"_DATASET_Data entry clerk\"},{\"id\":\"w900PX10L7O\",\"displayName\":\"_DATASET_M and E Officer\"},{\"id\":\"B6JNeAQ6akX\",\"displayName\":\"_DATASET_Superuser\"},{\"id\":\"zz6XckBrLlj\",\"displayName\":\"_DATASET_System administrator (ALL)\"},{\"id\":\"M1Qre0247G3\",\"displayName\":\"_PROGRAM_Antenatal care program\"},{\"id\":\"H9XnHoWRKCg\",\"displayName\":\"_PROGRAM_Child Health Tracker\"},{\"id\":\"NTC8GjJ7p8P\",\"displayName\":\"_PROGRAM_Inpatient program\"},{\"id\":\"vRoAruMnNpB\",\"displayName\":\"_PROGRAM_MNCH / PNC (Adult Woman) program\"},{\"id\":\"gXpmQO6eEOo\",\"displayName\":\"_PROGRAM_Superuser\"},{\"id\":\"pBnkuih0c1K\",\"displayName\":\"_PROGRAM_System administrator (ALL)\"},{\"id\":\"Kk12LkEWtXp\",\"displayName\":\"_PROGRAM_TB program\"},{\"id\":\"z1gNAf2zUxZ\",\"displayName\":\"_PROGRAM_WHO MCH program\"}]}",
"responseSize": 2041,
"responseHeaders": {
"server": "nginx/1.21.1",
"content-type": "application/json;charset=UTF-8",
"transfer-encoding": "chunked",
"connection": "keep-alive",
"access-control-allow-credentials": "true",
"access-control-allow-origin": "http://localhost:3000",
"vary": "Origin",
"access-control-expose-headers": "ETag, Location",
"cache-control": "no-cache, private",
"x-content-type-options": "nosniff",
"x-xss-protection": "1; mode=block",
"x-frame-options": "SAMEORIGIN"
}
}
]
Loading