From 23e58aad2f52ad3621c1c706f9c5c17b6d0d4ee9 Mon Sep 17 00:00:00 2001 From: SivaKanukolluQA Date: Thu, 7 Dec 2023 12:12:34 +0000 Subject: [PATCH 1/7] Added AM-3058: FTA for ET Judicial ORG roles. --- .../resources/features/F-010/F-010.feature | 42 +++++ .../resources/features/F-010/S-106.td.json | 175 ++++++++++++++++++ ...S-106_DeleteDataForRoleAssignments.td.json | 38 ++++ ...106_JRDEmploymentJudgeSalariedUser.td.json | 7 + .../S-106_PushMessageToJRDService.td.json | 10 + .../resources/features/F-010/S-107.td.json | 91 +++++++++ ...S-107_DeleteDataForRoleAssignments.td.json | 38 ++++ ...-107_JRDEmploymentJudgeFeePaidUser.td.json | 7 + .../S-107_PushMessageToJRDService.td.json | 10 + .../resources/features/F-010/S-108.td.json | 92 +++++++++ ...S-108_DeleteDataForRoleAssignments.td.json | 38 ++++ ...S-108_JRDTribunalMemberFeePaidUser.td.json | 7 + .../S-108_PushMessageToJRDService.td.json | 10 + 13 files changed, 565 insertions(+) create mode 100644 src/functionalTest/resources/features/F-010/S-106.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-106_DeleteDataForRoleAssignments.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-106_JRDEmploymentJudgeSalariedUser.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-106_PushMessageToJRDService.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-107.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-107_DeleteDataForRoleAssignments.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-107_JRDEmploymentJudgeFeePaidUser.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-107_PushMessageToJRDService.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-108.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-108_JRDTribunalMemberFeePaidUser.td.json create mode 100644 src/functionalTest/resources/features/F-010/S-108_PushMessageToJRDService.td.json diff --git a/src/functionalTest/resources/features/F-010/F-010.feature b/src/functionalTest/resources/features/F-010/F-010.feature index 347d6d4408..1284afc0e0 100644 --- a/src/functionalTest/resources/features/F-010/F-010.feature +++ b/src/functionalTest/resources/features/F-010/F-010.feature @@ -72,3 +72,45 @@ Feature: F-010 : Create Role Assignments for EmploymentTribunal Caseworker and J Then a positive response is received, And the response has all other details as expected And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-105_DeleteDataForRoleAssignments]. + + @S-106 + @FeatureToggle(DB:employment_wa_1_0=on) + Scenario: must successfully create judicial role mapping for Regional Employment Judge- Salaried appointment + Given a user with [an active IDAM profile with full permissions], + And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-106_DeleteDataForRoleAssignments], + And a successful call [to publish existing JRD user ids to endpoint] as in [S-106_PushMessageToJRDService], + And a successful call [to provide adequate time for RAS to create records] as in [WaitForRASProcessing], + And the request [contains the actorIds of the user just published], + When a request is prepared with appropriate values, + And it is submitted to call the [Fetch Assignment From Role Assignment Service] operation of [Role Assignment Service], + Then a positive response is received, + And the response has all other details as expected + And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-106_DeleteDataForRoleAssignments]. + + @S-107 + @FeatureToggle(DB:employment_wa_1_0=on) + Scenario: must successfully create judicial role mapping for Employment Judge- Fee Paid appointment + Given a user with [an active IDAM profile with full permissions], + And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-107_DeleteDataForRoleAssignments], + And a successful call [to publish existing JRD user ids to endpoint] as in [S-107_PushMessageToJRDService], + And a successful call [to provide adequate time for RAS to create records] as in [WaitForRASProcessing], + And the request [contains the actorIds of the user just published], + When a request is prepared with appropriate values, + And it is submitted to call the [Fetch Assignment From Role Assignment Service] operation of [Role Assignment Service], + Then a positive response is received, + And the response has all other details as expected + And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-107_DeleteDataForRoleAssignments]. + + @S-108 + @FeatureToggle(DB:employment_wa_1_0=on) + Scenario: must successfully create judicial role mapping for Tribunal Member-Fee Paid appointment + Given a user with [an active IDAM profile with full permissions], + And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-108_DeleteDataForRoleAssignments], + And a successful call [to publish existing JRD user ids to endpoint] as in [S-108_PushMessageToJRDService], + And a successful call [to provide adequate time for RAS to create records] as in [WaitForRASProcessing], + And the request [contains the actorIds of the user just published], + When a request is prepared with appropriate values, + And it is submitted to call the [Fetch Assignment From Role Assignment Service] operation of [Role Assignment Service], + Then a positive response is received, + And the response has all other details as expected + And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-108_DeleteDataForRoleAssignments]. diff --git a/src/functionalTest/resources/features/F-010/S-106.td.json b/src/functionalTest/resources/features/F-010/S-106.td.json new file mode 100644 index 0000000000..63d0318207 --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-106.td.json @@ -0,0 +1,175 @@ +{ + "_guid_": "S-106", + "title": "must successfully create judicial role mapping for Regional Employment Judge- Salaried appointment", + "_extends_": "F-010_Test_Data_Base", + "specs": [ + "contains the actorIds of the user just published" + ], + "method": "POST", + "uri": "{{ROLE_ASSIGNMENT_URL}}/am/role-assignments/query", + "request": { + "headers": { + "sort": "roleName", + "direction": "ASC", + "Content-Type": "application/vnd.uk.gov.hmcts.role-assignment-service.post-assignment-query-request+json;charset=UTF-8;version=2.0" + }, + "body": { + "queryRequests":[ + { + "actorId": "${[scenarioContext][childContexts][S-106_DeleteDataForRoleAssignments][testData][request][body][userIds]}", + "attributes": { + "jurisdiction": ["EMPLOYMENT"] + } + } + ] + } + }, + "expectedResponse": { + "_extends_": "Common_200_Response", + "body": { + "roleAssignmentResponse": [ + { + "id" : "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "case-allocator", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime" : "[[ANYTHING_PRESENT]]", + "created" : "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "contractType": "Salaried", + "primaryLocation" : "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT" + }, + "authorisations" : "[[ANYTHING_PRESENT]]" + }, + { + "id" : "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "hearing-viewer", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime" : "[[ANYTHING_PRESENT]]", + "created" : "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "primaryLocation" : "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT" + }, + "authorisations" : "[[ANYTHING_PRESENT]]" + }, + { + "id": "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "hmcts-judiciary", + "classification": "PRIVATE", + "grantType": "BASIC", + "roleCategory": "JUDICIAL", + "readOnly": true, + "beginTime" : "[[ANYTHING_PRESENT]]", + "created" : "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "contractType": "Salaried" + } + }, + { + "id": "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "judge", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime": "[[ANYTHING_PRESENT]]", + "created": "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "Y", + "contractType": "Salaried", + "primaryLocation": "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT", + "region": "[[ANYTHING_PRESENT]]", + "workTypes": "hearing_work,decision_making_work,routine_work,applications,amendments" + }, + "authorisations" : "[[ANYTHING_PRESENT]]" + }, + { + "id": "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "6548dbf7-fde6-4ad0-b7aa-511e39f824fb", + "roleType": "ORGANISATION", + "roleName": "leadership-judge", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime": "[[ANYTHING_PRESENT]]", + "created": "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "Y", + "contractType": "Salaried", + "primaryLocation": "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT", + "region": "[[ANYTHING_PRESENT]]" + }, + "authorisations": "[[ANYTHING_PRESENT]]" + }, + { + "id": "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "specific-access-approver-judiciary", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime": "[[ANYTHING_PRESENT]]", + "created": "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "contractType": "Salaried", + "primaryLocation": "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT", + "region": "[[ANYTHING_PRESENT]]", + "workTypes": "access_requests" + }, + "authorisations": "[[ANYTHING_PRESENT]]" + }, + { + "id" : "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "task-supervisor", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime" : "[[ANYTHING_PRESENT]]", + "created" : "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "contractType": "Salaried", + "primaryLocation" : "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT" + }, + "authorisations" : "[[ANYTHING_PRESENT]]" + } + ] + } + } +} diff --git a/src/functionalTest/resources/features/F-010/S-106_DeleteDataForRoleAssignments.td.json b/src/functionalTest/resources/features/F-010/S-106_DeleteDataForRoleAssignments.td.json new file mode 100644 index 0000000000..77498be47d --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-106_DeleteDataForRoleAssignments.td.json @@ -0,0 +1,38 @@ +{ + "_guid_": "S-106_DeleteDataForRoleAssignments", + "productName": "Role Assignment Service", + "operationName": "Delete Role Assignments by Process", + "method": "DELETE", + "uri": "{{ROLE_ASSIGNMENT_URL}}/am/role-assignments?process={process}&reference={reference}", + "specs": [ + "to delete role assignments just created above", + "to delete existing role assignments corresponding to the test actorId" + ], + "users": { + "invokingUser": { + "_extends_": "AmBeftaUser1" + } + }, + "request": { + "headers": { + "Authorization": "[[DEFAULT_AUTO_VALUE]]", + "ServiceAuthorization": "[[DEFAULT_AUTO_VALUE]]", + "X-Correlation-ID": "003352d0-e699-48bc-b6f5-5810411e60af" + }, + "pathVariables": { + "process": "staff-organisational-role-mapping", + "reference":"${[scenarioContext][testData][request][body][userIds][0]}" + }, + "body": { + "_extends_": "S-106_JRDEmploymentJudgeSalariedUser" + } + }, + + "expectedResponse": { + "headers": { + "Content-Length": "[[ANYTHING_PRESENT]]", + "Content-Type": "application/json" + }, + "_extends_": "Common_204_Response" + } +} diff --git a/src/functionalTest/resources/features/F-010/S-106_JRDEmploymentJudgeSalariedUser.td.json b/src/functionalTest/resources/features/F-010/S-106_JRDEmploymentJudgeSalariedUser.td.json new file mode 100644 index 0000000000..dc0e93f839 --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-106_JRDEmploymentJudgeSalariedUser.td.json @@ -0,0 +1,7 @@ +{ + "_guid_": "S-106_JRDEmploymentJudgeSalariedUser", + + "userIds": [ + "6548dbf7-fde6-4ad0-b7aa-511e39f824fb" + ] +} diff --git a/src/functionalTest/resources/features/F-010/S-106_PushMessageToJRDService.td.json b/src/functionalTest/resources/features/F-010/S-106_PushMessageToJRDService.td.json new file mode 100644 index 0000000000..d3f817966b --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-106_PushMessageToJRDService.td.json @@ -0,0 +1,10 @@ +{ + "_guid_": "S-106_PushMessageToJRDService", + "_extends_": "PushMessageToJRDProfileProcess", + + "request": { + "body": { + "_extends_": "S-106_JRDEmploymentJudgeSalariedUser" + } + } +} diff --git a/src/functionalTest/resources/features/F-010/S-107.td.json b/src/functionalTest/resources/features/F-010/S-107.td.json new file mode 100644 index 0000000000..900ed852be --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-107.td.json @@ -0,0 +1,91 @@ +{ + "_guid_": "S-107", + "title": "must successfully create judicial role mapping for Regional Employment Judge- Fee Paid appointment", + "_extends_": "F-010_Test_Data_Base", + "specs": [ + "contains the actorIds of the user just published" + ], + "method": "POST", + "uri": "{{ROLE_ASSIGNMENT_URL}}/am/role-assignments/query", + "request": { + "headers": { + "sort": "roleName", + "direction": "ASC", + "Content-Type": "application/vnd.uk.gov.hmcts.role-assignment-service.post-assignment-query-request+json;charset=UTF-8;version=2.0" + }, + "body": { + "queryRequests":[ + { + "actorId": "${[scenarioContext][childContexts][S-107_DeleteDataForRoleAssignments][testData][request][body][userIds]}", + "attributes": { + "jurisdiction": ["EMPLOYMENT"] + } + } + ] + } + }, + "expectedResponse": { + "_extends_": "Common_200_Response", + "body": { + "roleAssignmentResponse": [ + { + "id" : "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "hearing-viewer", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime" : "[[ANYTHING_PRESENT]]", + "created" : "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "primaryLocation" : "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT" + }, + "authorisations" : "[[ANYTHING_PRESENT]]" + }, + { + "id": "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "hmcts-judiciary", + "classification": "PRIVATE", + "grantType": "BASIC", + "roleCategory": "JUDICIAL", + "readOnly": true, + "beginTime" : "[[ANYTHING_PRESENT]]", + "created" : "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "contractType": "Fee-Paid" + } + }, + { + "id": "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "fee-paid-judge", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime": "[[ANYTHING_PRESENT]]", + "created": "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "contractType": "Fee-Paid", + "primaryLocation": "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT", + "workTypes": "hearing_work,decision_making_work,routine_work,applications,amendments" + }, + "authorisations" : "[[ANYTHING_PRESENT]]" + } + ] + } + } +} diff --git a/src/functionalTest/resources/features/F-010/S-107_DeleteDataForRoleAssignments.td.json b/src/functionalTest/resources/features/F-010/S-107_DeleteDataForRoleAssignments.td.json new file mode 100644 index 0000000000..b4f740ebe2 --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-107_DeleteDataForRoleAssignments.td.json @@ -0,0 +1,38 @@ +{ + "_guid_": "S-107_DeleteDataForRoleAssignments", + "productName": "Role Assignment Service", + "operationName": "Delete Role Assignments by Process", + "method": "DELETE", + "uri": "{{ROLE_ASSIGNMENT_URL}}/am/role-assignments?process={process}&reference={reference}", + "specs": [ + "to delete role assignments just created above", + "to delete existing role assignments corresponding to the test actorId" + ], + "users": { + "invokingUser": { + "_extends_": "AmBeftaUser1" + } + }, + "request": { + "headers": { + "Authorization": "[[DEFAULT_AUTO_VALUE]]", + "ServiceAuthorization": "[[DEFAULT_AUTO_VALUE]]", + "X-Correlation-ID": "003352d0-e699-48bc-b6f5-5810411e60af" + }, + "pathVariables": { + "process": "staff-organisational-role-mapping", + "reference":"${[scenarioContext][testData][request][body][userIds][0]}" + }, + "body": { + "_extends_": "S-107_JRDEmploymentJudgeFeePaidUser" + } + }, + + "expectedResponse": { + "headers": { + "Content-Length": "[[ANYTHING_PRESENT]]", + "Content-Type": "application/json" + }, + "_extends_": "Common_204_Response" + } +} diff --git a/src/functionalTest/resources/features/F-010/S-107_JRDEmploymentJudgeFeePaidUser.td.json b/src/functionalTest/resources/features/F-010/S-107_JRDEmploymentJudgeFeePaidUser.td.json new file mode 100644 index 0000000000..c84ec252b5 --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-107_JRDEmploymentJudgeFeePaidUser.td.json @@ -0,0 +1,7 @@ +{ + "_guid_": "S-107_JRDEmploymentJudgeFeePaidUser", + + "userIds": [ + "ff3b58be-97c8-4ca8-ac3d-73b2895a1560" + ] +} diff --git a/src/functionalTest/resources/features/F-010/S-107_PushMessageToJRDService.td.json b/src/functionalTest/resources/features/F-010/S-107_PushMessageToJRDService.td.json new file mode 100644 index 0000000000..e8c866e2ac --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-107_PushMessageToJRDService.td.json @@ -0,0 +1,10 @@ +{ + "_guid_": "S-107_PushMessageToJRDService", + "_extends_": "PushMessageToJRDProfileProcess", + + "request": { + "body": { + "_extends_": "S-107_JRDEmploymentJudgeFeePaidUser" + } + } +} diff --git a/src/functionalTest/resources/features/F-010/S-108.td.json b/src/functionalTest/resources/features/F-010/S-108.td.json new file mode 100644 index 0000000000..773aa2a5bd --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-108.td.json @@ -0,0 +1,92 @@ +{ + "_guid_": "S-108", + "title": "must successfully create judicial role mapping for Tribunal Member-Fee Paid appointment", + "_extends_": "F-010_Test_Data_Base", + "specs": [ + "contains the actorIds of the user just published" + ], + "method": "POST", + "uri": "{{ROLE_ASSIGNMENT_URL}}/am/role-assignments/query", + "request": { + "headers": { + "sort": "roleName", + "direction": "ASC", + "Content-Type": "application/vnd.uk.gov.hmcts.role-assignment-service.post-assignment-query-request+json;charset=UTF-8;version=2.0" + }, + "body": { + "queryRequests":[ + { + "actorId": "${[scenarioContext][childContexts][S-108_DeleteDataForRoleAssignments][testData][request][body][userIds]}", + "attributes": { + "jurisdiction": ["EMPLOYMENT"] + } + } + ] + } + }, + "expectedResponse": { + "_extends_": "Common_200_Response", + "body": { + "roleAssignmentResponse": [ + { + "id" : "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "hearing-viewer", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime" : "[[ANYTHING_PRESENT]]", + "created" : "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "primaryLocation" : "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT" + }, + "authorisations" : "[[ANYTHING_PRESENT]]" + }, + { + "id": "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "hmcts-judiciary", + "classification": "PRIVATE", + "grantType": "BASIC", + "roleCategory": "JUDICIAL", + "readOnly": true, + "beginTime" : "[[ANYTHING_PRESENT]]", + "created" : "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "N", + "contractType": "Fee-Paid" + } + }, + { + "id": "[[ANYTHING_PRESENT]]", + "actorIdType": "IDAM", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "roleType": "ORGANISATION", + "roleName": "tribunal-member", + "classification": "PUBLIC", + "grantType": "STANDARD", + "roleCategory": "JUDICIAL", + "readOnly": false, + "beginTime": "[[ANYTHING_PRESENT]]", + "created": "[[ANYTHING_PRESENT]]", + "attributes": { + "substantive": "Y", + "contractType": "Fee-Paid", + "primaryLocation": "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT", + "region": "[[ANYTHING_PRESENT]]", + "workTypes": "hearing_work" + }, + "authorisations" : "[[ANYTHING_PRESENT]]" + } + ] + } + } +} diff --git a/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json b/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json new file mode 100644 index 0000000000..3f28751fe5 --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json @@ -0,0 +1,38 @@ +{ + "_guid_": "S-108_DeleteDataForRoleAssignments", + "productName": "Role Assignment Service", + "operationName": "Delete Role Assignments by Process", + "method": "DELETE", + "uri": "{{ROLE_ASSIGNMENT_URL}}/am/role-assignments?process={process}&reference={reference}", + "specs": [ + "to delete role assignments just created above", + "to delete existing role assignments corresponding to the test actorId" + ], + "users": { + "invokingUser": { + "_extends_": "AmBeftaUser1" + } + }, + "request": { + "headers": { + "Authorization": "[[DEFAULT_AUTO_VALUE]]", + "ServiceAuthorization": "[[DEFAULT_AUTO_VALUE]]", + "X-Correlation-ID": "003352d0-e699-48bc-b6f5-5810411e60af" + }, + "pathVariables": { + "process": "staff-organisational-role-mapping", + "reference":"${[scenarioContext][testData][request][body][userIds][0]}" + }, + "body": { + "_extends_": "108_JRDTribunalMemberFeePaidUser" + } + }, + + "expectedResponse": { + "headers": { + "Content-Length": "[[ANYTHING_PRESENT]]", + "Content-Type": "application/json" + }, + "_extends_": "Common_204_Response" + } +} diff --git a/src/functionalTest/resources/features/F-010/S-108_JRDTribunalMemberFeePaidUser.td.json b/src/functionalTest/resources/features/F-010/S-108_JRDTribunalMemberFeePaidUser.td.json new file mode 100644 index 0000000000..727d325dd4 --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-108_JRDTribunalMemberFeePaidUser.td.json @@ -0,0 +1,7 @@ +{ + "_guid_": "S-108_JRDTribunalMemberFeePaidUser", + + "userIds": [ + "1667515b-36f4-4577-8a41-3fb49244276a" + ] +} diff --git a/src/functionalTest/resources/features/F-010/S-108_PushMessageToJRDService.td.json b/src/functionalTest/resources/features/F-010/S-108_PushMessageToJRDService.td.json new file mode 100644 index 0000000000..ef14cebc06 --- /dev/null +++ b/src/functionalTest/resources/features/F-010/S-108_PushMessageToJRDService.td.json @@ -0,0 +1,10 @@ +{ + "_guid_": "S-108_PushMessageToJRDService", + "_extends_": "PushMessageToJRDProfileProcess", + + "request": { + "body": { + "_extends_": "108_JRDTribunalMemberFeePaidUser" + } + } +} From a93d569ec157064e63aa135ecdf88dd172e58672 Mon Sep 17 00:00:00 2001 From: SivaKanukolluQA Date: Fri, 8 Dec 2023 11:25:28 +0000 Subject: [PATCH 2/7] Updated data file name. --- .../features/F-010/S-108_DeleteDataForRoleAssignments.td.json | 2 +- .../features/F-010/S-108_PushMessageToJRDService.td.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json b/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json index 3f28751fe5..daa0303dd6 100644 --- a/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json +++ b/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json @@ -24,7 +24,7 @@ "reference":"${[scenarioContext][testData][request][body][userIds][0]}" }, "body": { - "_extends_": "108_JRDTribunalMemberFeePaidUser" + "_extends_": "S-108_JRDTribunalMemberFeePaidUser" } }, diff --git a/src/functionalTest/resources/features/F-010/S-108_PushMessageToJRDService.td.json b/src/functionalTest/resources/features/F-010/S-108_PushMessageToJRDService.td.json index ef14cebc06..8d0b9f69b6 100644 --- a/src/functionalTest/resources/features/F-010/S-108_PushMessageToJRDService.td.json +++ b/src/functionalTest/resources/features/F-010/S-108_PushMessageToJRDService.td.json @@ -4,7 +4,7 @@ "request": { "body": { - "_extends_": "108_JRDTribunalMemberFeePaidUser" + "_extends_": "S-108_JRDTribunalMemberFeePaidUser" } } } From b9cfd95b434c752287f6645818e4dc78d43f45bb Mon Sep 17 00:00:00 2001 From: SivaKanukolluQA Date: Fri, 8 Dec 2023 12:29:37 +0000 Subject: [PATCH 3/7] Updated test data. --- src/functionalTest/resources/features/F-010/S-106.td.json | 7 +++++++ src/functionalTest/resources/features/F-010/S-107.td.json | 7 +++++++ src/functionalTest/resources/features/F-010/S-108.td.json | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/src/functionalTest/resources/features/F-010/S-106.td.json b/src/functionalTest/resources/features/F-010/S-106.td.json index 63d0318207..b7b76929a5 100644 --- a/src/functionalTest/resources/features/F-010/S-106.td.json +++ b/src/functionalTest/resources/features/F-010/S-106.td.json @@ -15,6 +15,13 @@ }, "body": { "queryRequests":[ + { + "actorId": "${[scenarioContext][childContexts][S-106_DeleteDataForRoleAssignments][testData][request][body][userIds]}", + "roleName": ["hmcts-judiciary"], + "attributes": { + "contractType": ["Salaried"] + } + }, { "actorId": "${[scenarioContext][childContexts][S-106_DeleteDataForRoleAssignments][testData][request][body][userIds]}", "attributes": { diff --git a/src/functionalTest/resources/features/F-010/S-107.td.json b/src/functionalTest/resources/features/F-010/S-107.td.json index 900ed852be..4fc65669ea 100644 --- a/src/functionalTest/resources/features/F-010/S-107.td.json +++ b/src/functionalTest/resources/features/F-010/S-107.td.json @@ -15,6 +15,13 @@ }, "body": { "queryRequests":[ + { + "actorId": "${[scenarioContext][childContexts][S-107_DeleteDataForRoleAssignments][testData][request][body][userIds]}", + "roleName": ["hmcts-judiciary"], + "attributes": { + "contractType": ["Fee-Paid"] + } + }, { "actorId": "${[scenarioContext][childContexts][S-107_DeleteDataForRoleAssignments][testData][request][body][userIds]}", "attributes": { diff --git a/src/functionalTest/resources/features/F-010/S-108.td.json b/src/functionalTest/resources/features/F-010/S-108.td.json index 773aa2a5bd..544997398e 100644 --- a/src/functionalTest/resources/features/F-010/S-108.td.json +++ b/src/functionalTest/resources/features/F-010/S-108.td.json @@ -15,6 +15,13 @@ }, "body": { "queryRequests":[ + { + "actorId": "${[scenarioContext][childContexts][S-108_DeleteDataForRoleAssignments][testData][request][body][userIds]}", + "roleName": ["hmcts-judiciary"], + "attributes": { + "contractType": ["Fee-Paid"] + } + }, { "actorId": "${[scenarioContext][childContexts][S-108_DeleteDataForRoleAssignments][testData][request][body][userIds]}", "attributes": { From 8b0c9f27dd38d58a085a7dfbf53f9a73052b906f Mon Sep 17 00:00:00 2001 From: SivaKanukolluQA Date: Fri, 8 Dec 2023 13:17:52 +0000 Subject: [PATCH 4/7] Added end date element to Fee Paid judges. --- .../resources/features/F-010/S-107.td.json | 54 ++++++------------- .../resources/features/F-010/S-108.td.json | 27 +--------- 2 files changed, 18 insertions(+), 63 deletions(-) diff --git a/src/functionalTest/resources/features/F-010/S-107.td.json b/src/functionalTest/resources/features/F-010/S-107.td.json index 4fc65669ea..e58cf1c97c 100644 --- a/src/functionalTest/resources/features/F-010/S-107.td.json +++ b/src/functionalTest/resources/features/F-010/S-107.td.json @@ -15,13 +15,6 @@ }, "body": { "queryRequests":[ - { - "actorId": "${[scenarioContext][childContexts][S-107_DeleteDataForRoleAssignments][testData][request][body][userIds]}", - "roleName": ["hmcts-judiciary"], - "attributes": { - "contractType": ["Fee-Paid"] - } - }, { "actorId": "${[scenarioContext][childContexts][S-107_DeleteDataForRoleAssignments][testData][request][body][userIds]}", "attributes": { @@ -36,59 +29,44 @@ "body": { "roleAssignmentResponse": [ { - "id" : "[[ANYTHING_PRESENT]]", + "id": "[[ANYTHING_PRESENT]]", "actorIdType": "IDAM", "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", "roleType": "ORGANISATION", - "roleName": "hearing-viewer", + "roleName": "fee-paid-judge", "classification": "PUBLIC", "grantType": "STANDARD", "roleCategory": "JUDICIAL", "readOnly": false, - "beginTime" : "[[ANYTHING_PRESENT]]", - "created" : "[[ANYTHING_PRESENT]]", + "beginTime": "[[ANYTHING_PRESENT]]", + "endTime" : "[[ANYTHING_PRESENT]]", + "created": "[[ANYTHING_PRESENT]]", "attributes": { "substantive": "N", - "primaryLocation" : "[[ANYTHING_PRESENT]]", - "jurisdiction": "EMPLOYMENT" + "contractType": "Fee-Paid", + "primaryLocation": "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT", + "workTypes": "hearing_work,decision_making_work,routine_work,applications,amendments" }, "authorisations" : "[[ANYTHING_PRESENT]]" }, { - "id": "[[ANYTHING_PRESENT]]", - "actorIdType": "IDAM", - "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", - "roleType": "ORGANISATION", - "roleName": "hmcts-judiciary", - "classification": "PRIVATE", - "grantType": "BASIC", - "roleCategory": "JUDICIAL", - "readOnly": true, - "beginTime" : "[[ANYTHING_PRESENT]]", - "created" : "[[ANYTHING_PRESENT]]", - "attributes": { - "substantive": "N", - "contractType": "Fee-Paid" - } - }, - { - "id": "[[ANYTHING_PRESENT]]", + "id" : "[[ANYTHING_PRESENT]]", "actorIdType": "IDAM", "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", "roleType": "ORGANISATION", - "roleName": "fee-paid-judge", + "roleName": "hearing-viewer", "classification": "PUBLIC", "grantType": "STANDARD", "roleCategory": "JUDICIAL", "readOnly": false, - "beginTime": "[[ANYTHING_PRESENT]]", - "created": "[[ANYTHING_PRESENT]]", + "beginTime" : "[[ANYTHING_PRESENT]]", + "endTime" : "[[ANYTHING_PRESENT]]", + "created" : "[[ANYTHING_PRESENT]]", "attributes": { "substantive": "N", - "contractType": "Fee-Paid", - "primaryLocation": "[[ANYTHING_PRESENT]]", - "jurisdiction": "EMPLOYMENT", - "workTypes": "hearing_work,decision_making_work,routine_work,applications,amendments" + "primaryLocation" : "[[ANYTHING_PRESENT]]", + "jurisdiction": "EMPLOYMENT" }, "authorisations" : "[[ANYTHING_PRESENT]]" } diff --git a/src/functionalTest/resources/features/F-010/S-108.td.json b/src/functionalTest/resources/features/F-010/S-108.td.json index 544997398e..9d66515505 100644 --- a/src/functionalTest/resources/features/F-010/S-108.td.json +++ b/src/functionalTest/resources/features/F-010/S-108.td.json @@ -15,13 +15,6 @@ }, "body": { "queryRequests":[ - { - "actorId": "${[scenarioContext][childContexts][S-108_DeleteDataForRoleAssignments][testData][request][body][userIds]}", - "roleName": ["hmcts-judiciary"], - "attributes": { - "contractType": ["Fee-Paid"] - } - }, { "actorId": "${[scenarioContext][childContexts][S-108_DeleteDataForRoleAssignments][testData][request][body][userIds]}", "attributes": { @@ -46,6 +39,7 @@ "roleCategory": "JUDICIAL", "readOnly": false, "beginTime" : "[[ANYTHING_PRESENT]]", + "endTime" : "[[ANYTHING_PRESENT]]", "created" : "[[ANYTHING_PRESENT]]", "attributes": { "substantive": "N", @@ -54,23 +48,6 @@ }, "authorisations" : "[[ANYTHING_PRESENT]]" }, - { - "id": "[[ANYTHING_PRESENT]]", - "actorIdType": "IDAM", - "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", - "roleType": "ORGANISATION", - "roleName": "hmcts-judiciary", - "classification": "PRIVATE", - "grantType": "BASIC", - "roleCategory": "JUDICIAL", - "readOnly": true, - "beginTime" : "[[ANYTHING_PRESENT]]", - "created" : "[[ANYTHING_PRESENT]]", - "attributes": { - "substantive": "N", - "contractType": "Fee-Paid" - } - }, { "id": "[[ANYTHING_PRESENT]]", "actorIdType": "IDAM", @@ -82,13 +59,13 @@ "roleCategory": "JUDICIAL", "readOnly": false, "beginTime": "[[ANYTHING_PRESENT]]", + "endTime" : "[[ANYTHING_PRESENT]]", "created": "[[ANYTHING_PRESENT]]", "attributes": { "substantive": "Y", "contractType": "Fee-Paid", "primaryLocation": "[[ANYTHING_PRESENT]]", "jurisdiction": "EMPLOYMENT", - "region": "[[ANYTHING_PRESENT]]", "workTypes": "hearing_work" }, "authorisations" : "[[ANYTHING_PRESENT]]" From 73cc5f2e8eb85aaa2e550d55d101a38dfe08ff60 Mon Sep 17 00:00:00 2001 From: SivaKanukolluQA Date: Mon, 11 Dec 2023 10:53:09 +0000 Subject: [PATCH 5/7] FTAs Tidy up. --- src/functionalTest/resources/features/F-010/F-010.feature | 6 +++--- src/functionalTest/resources/features/F-010/S-106.td.json | 2 +- src/functionalTest/resources/features/F-010/S-107.td.json | 2 +- src/functionalTest/resources/features/F-010/S-108.td.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/functionalTest/resources/features/F-010/F-010.feature b/src/functionalTest/resources/features/F-010/F-010.feature index 1284afc0e0..80804b62a2 100644 --- a/src/functionalTest/resources/features/F-010/F-010.feature +++ b/src/functionalTest/resources/features/F-010/F-010.feature @@ -75,7 +75,7 @@ Feature: F-010 : Create Role Assignments for EmploymentTribunal Caseworker and J @S-106 @FeatureToggle(DB:employment_wa_1_0=on) - Scenario: must successfully create judicial role mapping for Regional Employment Judge- Salaried appointment + Scenario: must successfully create judicial role mapping for Regional Employment Judge - Salaried appointment Given a user with [an active IDAM profile with full permissions], And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-106_DeleteDataForRoleAssignments], And a successful call [to publish existing JRD user ids to endpoint] as in [S-106_PushMessageToJRDService], @@ -89,7 +89,7 @@ Feature: F-010 : Create Role Assignments for EmploymentTribunal Caseworker and J @S-107 @FeatureToggle(DB:employment_wa_1_0=on) - Scenario: must successfully create judicial role mapping for Employment Judge- Fee Paid appointment + Scenario: must successfully create judicial role mapping for Employment Judge - Fee Paid appointment Given a user with [an active IDAM profile with full permissions], And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-107_DeleteDataForRoleAssignments], And a successful call [to publish existing JRD user ids to endpoint] as in [S-107_PushMessageToJRDService], @@ -103,7 +103,7 @@ Feature: F-010 : Create Role Assignments for EmploymentTribunal Caseworker and J @S-108 @FeatureToggle(DB:employment_wa_1_0=on) - Scenario: must successfully create judicial role mapping for Tribunal Member-Fee Paid appointment + Scenario: must successfully create judicial role mapping for Tribunal Member - Fee Paid appointment Given a user with [an active IDAM profile with full permissions], And a successful call [to delete existing role assignments corresponding to the test actorId] as in [S-108_DeleteDataForRoleAssignments], And a successful call [to publish existing JRD user ids to endpoint] as in [S-108_PushMessageToJRDService], diff --git a/src/functionalTest/resources/features/F-010/S-106.td.json b/src/functionalTest/resources/features/F-010/S-106.td.json index b7b76929a5..d323e2414a 100644 --- a/src/functionalTest/resources/features/F-010/S-106.td.json +++ b/src/functionalTest/resources/features/F-010/S-106.td.json @@ -1,6 +1,6 @@ { "_guid_": "S-106", - "title": "must successfully create judicial role mapping for Regional Employment Judge- Salaried appointment", + "title": "must successfully create judicial role mapping for Regional Employment Judge - Salaried appointment", "_extends_": "F-010_Test_Data_Base", "specs": [ "contains the actorIds of the user just published" diff --git a/src/functionalTest/resources/features/F-010/S-107.td.json b/src/functionalTest/resources/features/F-010/S-107.td.json index e58cf1c97c..4bf12d929e 100644 --- a/src/functionalTest/resources/features/F-010/S-107.td.json +++ b/src/functionalTest/resources/features/F-010/S-107.td.json @@ -1,6 +1,6 @@ { "_guid_": "S-107", - "title": "must successfully create judicial role mapping for Regional Employment Judge- Fee Paid appointment", + "title": "must successfully create judicial role mapping for Employment Judge - Fee Paid appointment", "_extends_": "F-010_Test_Data_Base", "specs": [ "contains the actorIds of the user just published" diff --git a/src/functionalTest/resources/features/F-010/S-108.td.json b/src/functionalTest/resources/features/F-010/S-108.td.json index 9d66515505..3df9fee4dc 100644 --- a/src/functionalTest/resources/features/F-010/S-108.td.json +++ b/src/functionalTest/resources/features/F-010/S-108.td.json @@ -1,6 +1,6 @@ { "_guid_": "S-108", - "title": "must successfully create judicial role mapping for Tribunal Member-Fee Paid appointment", + "title": "must successfully create judicial role mapping for Tribunal Member - Fee Paid appointment", "_extends_": "F-010_Test_Data_Base", "specs": [ "contains the actorIds of the user just published" From b91f4f362a6268b16a99a9506d33adbb9aae43e9 Mon Sep 17 00:00:00 2001 From: SivaKanukolluQA Date: Mon, 11 Dec 2023 14:45:18 +0000 Subject: [PATCH 6/7] Request Query Tidy up. --- src/functionalTest/resources/features/F-010/S-106.td.json | 2 +- src/functionalTest/resources/features/F-010/S-107.td.json | 4 ++-- src/functionalTest/resources/features/F-010/S-108.td.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/functionalTest/resources/features/F-010/S-106.td.json b/src/functionalTest/resources/features/F-010/S-106.td.json index d323e2414a..a951f30e5c 100644 --- a/src/functionalTest/resources/features/F-010/S-106.td.json +++ b/src/functionalTest/resources/features/F-010/S-106.td.json @@ -116,7 +116,7 @@ { "id": "[[ANYTHING_PRESENT]]", "actorIdType": "IDAM", - "actorId": "6548dbf7-fde6-4ad0-b7aa-511e39f824fb", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", "roleType": "ORGANISATION", "roleName": "leadership-judge", "classification": "PUBLIC", diff --git a/src/functionalTest/resources/features/F-010/S-107.td.json b/src/functionalTest/resources/features/F-010/S-107.td.json index 4bf12d929e..0c690a398e 100644 --- a/src/functionalTest/resources/features/F-010/S-107.td.json +++ b/src/functionalTest/resources/features/F-010/S-107.td.json @@ -31,7 +31,7 @@ { "id": "[[ANYTHING_PRESENT]]", "actorIdType": "IDAM", - "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][0][actorId][0]}", "roleType": "ORGANISATION", "roleName": "fee-paid-judge", "classification": "PUBLIC", @@ -53,7 +53,7 @@ { "id" : "[[ANYTHING_PRESENT]]", "actorIdType": "IDAM", - "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][0][actorId][0]}", "roleType": "ORGANISATION", "roleName": "hearing-viewer", "classification": "PUBLIC", diff --git a/src/functionalTest/resources/features/F-010/S-108.td.json b/src/functionalTest/resources/features/F-010/S-108.td.json index 3df9fee4dc..8e430ddae8 100644 --- a/src/functionalTest/resources/features/F-010/S-108.td.json +++ b/src/functionalTest/resources/features/F-010/S-108.td.json @@ -31,7 +31,7 @@ { "id" : "[[ANYTHING_PRESENT]]", "actorIdType": "IDAM", - "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][0][actorId][0]}", "roleType": "ORGANISATION", "roleName": "hearing-viewer", "classification": "PUBLIC", @@ -51,7 +51,7 @@ { "id": "[[ANYTHING_PRESENT]]", "actorIdType": "IDAM", - "actorId": "${[scenarioContext][testData][request][body][queryRequests][1][actorId][0]}", + "actorId": "${[scenarioContext][testData][request][body][queryRequests][0][actorId][0]}", "roleType": "ORGANISATION", "roleName": "tribunal-member", "classification": "PUBLIC", From 79569ab9c9b1085fc204051868a90b5e8bc60293 Mon Sep 17 00:00:00 2001 From: SivaKanukolluQA Date: Mon, 11 Dec 2023 18:38:08 +0000 Subject: [PATCH 7/7] Updated review comments. --- .../features/F-010/S-106_DeleteDataForRoleAssignments.td.json | 3 +-- .../features/F-010/S-107_DeleteDataForRoleAssignments.td.json | 3 +-- .../features/F-010/S-108_DeleteDataForRoleAssignments.td.json | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/functionalTest/resources/features/F-010/S-106_DeleteDataForRoleAssignments.td.json b/src/functionalTest/resources/features/F-010/S-106_DeleteDataForRoleAssignments.td.json index 77498be47d..e9f16a448e 100644 --- a/src/functionalTest/resources/features/F-010/S-106_DeleteDataForRoleAssignments.td.json +++ b/src/functionalTest/resources/features/F-010/S-106_DeleteDataForRoleAssignments.td.json @@ -5,7 +5,6 @@ "method": "DELETE", "uri": "{{ROLE_ASSIGNMENT_URL}}/am/role-assignments?process={process}&reference={reference}", "specs": [ - "to delete role assignments just created above", "to delete existing role assignments corresponding to the test actorId" ], "users": { @@ -20,7 +19,7 @@ "X-Correlation-ID": "003352d0-e699-48bc-b6f5-5810411e60af" }, "pathVariables": { - "process": "staff-organisational-role-mapping", + "process": "judicial-organisational-role-mapping", "reference":"${[scenarioContext][testData][request][body][userIds][0]}" }, "body": { diff --git a/src/functionalTest/resources/features/F-010/S-107_DeleteDataForRoleAssignments.td.json b/src/functionalTest/resources/features/F-010/S-107_DeleteDataForRoleAssignments.td.json index b4f740ebe2..c67c60b3f0 100644 --- a/src/functionalTest/resources/features/F-010/S-107_DeleteDataForRoleAssignments.td.json +++ b/src/functionalTest/resources/features/F-010/S-107_DeleteDataForRoleAssignments.td.json @@ -5,7 +5,6 @@ "method": "DELETE", "uri": "{{ROLE_ASSIGNMENT_URL}}/am/role-assignments?process={process}&reference={reference}", "specs": [ - "to delete role assignments just created above", "to delete existing role assignments corresponding to the test actorId" ], "users": { @@ -20,7 +19,7 @@ "X-Correlation-ID": "003352d0-e699-48bc-b6f5-5810411e60af" }, "pathVariables": { - "process": "staff-organisational-role-mapping", + "process": "judicial-organisational-role-mapping", "reference":"${[scenarioContext][testData][request][body][userIds][0]}" }, "body": { diff --git a/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json b/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json index daa0303dd6..20c9e57d59 100644 --- a/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json +++ b/src/functionalTest/resources/features/F-010/S-108_DeleteDataForRoleAssignments.td.json @@ -5,7 +5,6 @@ "method": "DELETE", "uri": "{{ROLE_ASSIGNMENT_URL}}/am/role-assignments?process={process}&reference={reference}", "specs": [ - "to delete role assignments just created above", "to delete existing role assignments corresponding to the test actorId" ], "users": { @@ -20,7 +19,7 @@ "X-Correlation-ID": "003352d0-e699-48bc-b6f5-5810411e60af" }, "pathVariables": { - "process": "staff-organisational-role-mapping", + "process": "judicial-organisational-role-mapping", "reference":"${[scenarioContext][testData][request][body][userIds][0]}" }, "body": {