feat: parameterize switch id

mojaloop · Jun 27, 2024 · d695fbf · d695fbf
1 parent aa35fa2
commit d695fbf
Show file tree

Hide file tree

Showing 24 changed files with 62 additions and 62 deletions.
diff --git a/...date requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json b/...date requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json
@@ -290,7 +290,7 @@
                 "id": 14,
                 "description": "Payee Notification FSP Source is Switch",
                 "exec": [
-                  "// expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('switch')"
+                  "// expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -656,7 +656,7 @@
                 "id": 14,
                 "description": "Payee Notification FSP Source is Switch",
                 "exec": [
-                  "expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('switch')"
+                  "expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/...lden_path/feature_tests/Active_Inactive_participants/active_and_inactive_participant.json b/...lden_path/feature_tests/Active_Inactive_participants/active_and_inactive_participant.json
@@ -176,7 +176,7 @@
                 "description": "Payer side Callback Header - fspiop-source is switch",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },
@@ -355,7 +355,7 @@
                 "description": "Payer side Callback Header - fspiop-source is switch",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },

diff --git a/...feature_tests/Active_Inactive_participants/active_and_inactive_participants_accounts.json b/...feature_tests/Active_Inactive_participants/active_and_inactive_participants_accounts.json
@@ -213,7 +213,7 @@
                 "description": "Payer side Callback Header - fspiop-source is switch",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },
@@ -391,7 +391,7 @@
                 "description": "Payer side Callback Header - fspiop-source is switch",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },

diff --git a/collections/hub/golden_path/feature_tests/block_transfer.json b/collections/hub/golden_path/feature_tests/block_transfer.json
@@ -457,9 +457,9 @@
               },
               {
                 "id": 4,
-                "description": "'fspiop-source' should be 'switch'",
+                "description": "'fspiop-source' should be '{$inputs.HUB_NAME}'",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch');"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}');"
                 ]
               },
               {
@@ -1259,9 +1259,9 @@
               },
               {
                 "id": 4,
-                "description": "'fspiop-source' should be 'switch'",
+                "description": "'fspiop-source' should be '{$inputs.HUB_NAME}'",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch');"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}');"
                 ]
               },
               {

diff --git a/collections/hub/golden_path/feature_tests/duplicate_handling/transfers/fulfill_commit.json b/collections/hub/golden_path/feature_tests/duplicate_handling/transfers/fulfill_commit.json
@@ -443,7 +443,7 @@
                 "id": 12,
                 "description": "Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },
@@ -882,7 +882,7 @@
                 "id": 3,
                 "description": "Payee Side Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/collections/hub/golden_path/feature_tests/duplicate_handling/transfers/fulfill_reject.json b/collections/hub/golden_path/feature_tests/duplicate_handling/transfers/fulfill_reject.json
@@ -439,7 +439,7 @@
                 "id": 12,
                 "description": "Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },
@@ -958,7 +958,7 @@
                 "id": 12,
                 "description": "Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/...olden_path/feature_tests/duplicate_handling/transfers/original_transfer_at_committed.json b/...olden_path/feature_tests/duplicate_handling/transfers/original_transfer_at_committed.json
@@ -738,7 +738,7 @@
                 "id": 15,
                 "description": "Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/collections/hub/golden_path/feature_tests/funds_in/funds_in_ttk.json b/collections/hub/golden_path/feature_tests/funds_in/funds_in_ttk.json
@@ -365,7 +365,7 @@
                 "id": 2,
                 "description": "fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/collections/hub/golden_path/feature_tests/funds_out/Reserve&Abort/funds_out_abort.json b/collections/hub/golden_path/feature_tests/funds_out/Reserve&Abort/funds_out_abort.json
@@ -365,7 +365,7 @@
                 "id": 2,
                 "description": "fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -764,7 +764,7 @@
                 "id": 2,
                 "description": "fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/collections/hub/golden_path/feature_tests/funds_out/Reserve&Commit/funds_out_commit.json b/collections/hub/golden_path/feature_tests/funds_out/Reserve&Commit/funds_out_commit.json
@@ -365,7 +365,7 @@
                 "id": 2,
                 "description": "fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -764,7 +764,7 @@
                 "id": 2,
                 "description": "fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/collections/hub/golden_path/feature_tests/get_transfers.json b/collections/hub/golden_path/feature_tests/get_transfers.json
@@ -544,9 +544,9 @@
               },
               {
                 "id": 2,
-                "description": "Payer FSP: 'fspiop-source' is 'switch'",
+                "description": "Payer FSP: 'fspiop-source' is $inputs.HUB_NAME",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -658,10 +658,10 @@
               },
               {
                 "id": 2,
-                "description": "Payee FSP: 'fspiop-source' is 'switch'",
+                "description": "Payee FSP: 'fspiop-source' is $inputs.HUB_NAME",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  " expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('switch')",
+                  " expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },
@@ -786,10 +786,10 @@
               },
               {
                 "id": 2,
-                "description": "Payee FSP: 'fspiop-source' is 'switch'",
+                "description": "Payee FSP: 'fspiop-source' is $inputs.HUB_NAME",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  " expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('switch')",
+                  " expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },
@@ -923,9 +923,9 @@
               },
               {
                 "id": 2,
-                "description": "Payer FSP: 'fspiop-source' is 'switch'",
+                "description": "Payer FSP: 'fspiop-source' is $inputs.HUB_NAME",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/collections/hub/golden_path/feature_tests/patch_notifications/patch_notification.json b/collections/hub/golden_path/feature_tests/patch_notifications/patch_notification.json
@@ -289,7 +289,7 @@
                 "id": 14,
                 "description": "Payee Notification FSP Source is Switch",
                 "exec": [
-                  "expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('switch')"
+                  "expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -620,7 +620,7 @@
                 "id": 14,
                 "description": "Payee Notification FSP Source is Switch",
                 "exec": [
-                  "expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('switch')"
+                  "expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/...en_path/feature_tests/post_scenarios/reserve_notification_positive_testfsp1_testfsp2.json b/...en_path/feature_tests/post_scenarios/reserve_notification_positive_testfsp1_testfsp2.json
@@ -997,11 +997,11 @@
               },
               {
                 "id": 74,
-                "description": "On testfsp1 'fspiop-source' is 'switch'",
+                "description": "On testfsp1 'fspiop-source' is $inputs.HUB_NAME",
                 "exec": [
                   "/* Disabled temporarily",
                   "if (environment.TEST_NOTIFICATIONS && environment.ENABLE_WS_ASSERTIONS===true) {",
-                  "  expect(requestVariables.payeeSideTransferRequest.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(requestVariables.payeeSideTransferRequest.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}",
                   "*/"
                 ]

diff --git a/...tions/hub/golden_path/feature_tests/transfer_negative_scenarios/fulfil-reserved-v1.0.json b/...tions/hub/golden_path/feature_tests/transfer_negative_scenarios/fulfil-reserved-v1.0.json
@@ -362,7 +362,7 @@
                 "id": 12,
                 "description": "Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },
@@ -481,7 +481,7 @@
                 "id": 12,
                 "description": "Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(requestVariables.transferCallback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(requestVariables.transferCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/collections/hub/golden_path/feature_tests/transfer_negative_scenarios/payee_abort_v1.1.json b/collections/hub/golden_path/feature_tests/transfer_negative_scenarios/payee_abort_v1.1.json
@@ -436,7 +436,7 @@
                 "id": 12,
                 "description": "Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/.../hub/golden_path/feature_tests/transfer_negative_scenarios/payee_invalid_fulfillment.json b/.../hub/golden_path/feature_tests/transfer_negative_scenarios/payee_invalid_fulfillment.json
@@ -462,7 +462,7 @@
                 "id": 12,
                 "description": "Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/...ns/hub/golden_path/feature_tests/transfer_negative_scenarios/payee_invalid_timestamp.json b/...ns/hub/golden_path/feature_tests/transfer_negative_scenarios/payee_invalid_timestamp.json
@@ -454,7 +454,7 @@
                 "id": 12,
                 "description": "Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/...ons/hub/golden_path/feature_tests/transfer_negative_scenarios/payer_transfer_timeout.json b/...ons/hub/golden_path/feature_tests/transfer_negative_scenarios/payer_transfer_timeout.json
@@ -155,7 +155,7 @@
                 "id": 3,
                 "description": "Payer FSP Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(requestVariables.payerCallback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(requestVariables.payerCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },
@@ -187,7 +187,7 @@
                 "id": 7,
                 "description": "Payee FSP Callback Header - fspiop-source is switch",
                 "exec": [
-                  "expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/collections/hub/golden_path/p2p_on_us_transfers/p2p_money_transfer_on_us.json b/collections/hub/golden_path/p2p_on_us_transfers/p2p_money_transfer_on_us.json
@@ -403,7 +403,7 @@
                   "if (environment.ON_US_TRANSFERS_ENABLED===true) {",
                   "expect(environment.callbackt.headers['fspiop-source']).to.equal('{$inputs.toFspId}')",
                   "}else{",
-                  "  expect(environment.callbackt.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(environment.callbackt.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },

diff --git a/collections/hub/other_tests/bulk_transfers/bulk-duplicated-transfers.json b/collections/hub/other_tests/bulk_transfers/bulk-duplicated-transfers.json
@@ -92,7 +92,7 @@
                 "id": 3,
                 "description": "payerfsp callback - fspiop-source should be switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -164,7 +164,7 @@
                 "id": 13,
                 "description": "payeefsp callback - fspiop-source should be switch",
                 "exec": [
-                  "expect(environment.bulkTransfersNegativeCallback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(environment.bulkTransfersNegativeCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -236,7 +236,7 @@
                 "id": 23,
                 "description": "payeefsp request - fspiop-source should be switch",
                 "exec": [
-                  "expect(environment.bulkTransfersNegativeRequest.headers['fspiop-source']).to.equal('switch')"
+                  "expect(environment.bulkTransfersNegativeRequest.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -636,7 +636,7 @@
                 "id": 3,
                 "description": "payerfsp callback - fspiop-source should be switch",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -708,7 +708,7 @@
                 "id": 13,
                 "description": "payeefsp callback - fspiop-source should be switch",
                 "exec": [
-                  "expect(environment.bulkTransfersNegativeCallback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(environment.bulkTransfersNegativeCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -780,7 +780,7 @@
                 "id": 23,
                 "description": "payeefsp request - fspiop-source should be switch",
                 "exec": [
-                  "expect(environment.bulkTransfersNegativeRequest.headers['fspiop-source']).to.equal('switch')"
+                  "expect(environment.bulkTransfersNegativeRequest.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/collections/hub/other_tests/bulk_transfers/bulk-invalid-timestamp.json b/collections/hub/other_tests/bulk_transfers/bulk-invalid-timestamp.json
@@ -357,7 +357,7 @@
                 "id": 3,
                 "description": "payerfsp callback - fspiop-source should be switch",
                 "exec": [
-                  "expect(requestVariables.bulkTransferCallback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(requestVariables.bulkTransferCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -441,7 +441,7 @@
                 "          Accept: `{$inputs.acceptBulkTransfers}`,",
                 "          Date: `{$environment.headerDate}`,",
                 "          'FSPIOP-Source': `{$inputs.fromFspId}`,",
-                "          'FSPIOP-Destination': 'switch'",
+                "          'FSPIOP-Destination': '{$inputs.HUB_NAME}'",
                 "        }",
                 "    };",
                 "    ",