From eb044868923e6e5870b32913b73f4b5bfc7fe488 Mon Sep 17 00:00:00 2001
From: Thea Bautista <thea.bautista@digital.cabinet-office.gov.uk>
Date: Fri, 17 Jan 2025 16:55:24 +0000
Subject: [PATCH] PYIC-7797: fix typos and set default to append to existing
 features set

---
 api-tests/features/audit-events.feature |  8 ++++----
 api-tests/src/steps/ipv-steps.ts        | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/api-tests/features/audit-events.feature b/api-tests/features/audit-events.feature
index 4349657cfa..613db732fd 100644
--- a/api-tests/features/audit-events.feature
+++ b/api-tests/features/audit-events.feature
@@ -79,7 +79,7 @@ Feature: Audit Events
       | evidence_requested | {"scoringPolicy":"gpg45","strengthScore":3} |
     Then I get a 'page-face-to-face-handoff' page response
 
-    Given I activate the 'pendingF2FResetEnabled' feature set along with the e
+    Given I activate the 'pendingF2FResetEnabled' feature set
     When I start a new 'medium-confidence' journey
     Then I get a 'page-ipv-pending' page response with context 'f2f-delete-details'
     When I submit a 'next' event
@@ -132,7 +132,7 @@ Feature: Audit Events
     And audit events for 'reprove-identity-journey' are recorded [local only]
 
   Scenario: No photo ID
-    Given I activate the 'p1Journeys' feature set along with the existing feature set
+    Given I activate the 'p1Journeys' feature set
     When I start a new 'low-confidence' journey
     Then I get a 'page-ipv-identity-document-start' page response
     When I submit an 'end' event
@@ -187,7 +187,7 @@ Feature: Audit Events
     And audit events for 'inherited-identity-journey' are recorded [local only]
 
   Scenario: International address journey
-    Given I activate the 'internationalAddress' feature set along with the existing feature set
+    Given I activate the 'internationalAddress' feature set
     And I start a new 'medium-confidence' journey
     Then I get a 'live-in-uk' page response
     When I submit a 'international' event
@@ -197,7 +197,7 @@ Feature: Audit Events
     And audit events for 'international-address-journey' are recorded [local only]
 
   Scenario: Strategic app journey
-    Given I activate the 'strategicApp' feature set along with the existing feature set
+    Given I activate the 'strategicApp' feature set
     When I start a new 'medium-confidence' journey
     Then I get a 'page-ipv-identity-document-start' page response
     When I submit an 'appTriage' event
diff --git a/api-tests/src/steps/ipv-steps.ts b/api-tests/src/steps/ipv-steps.ts
index bb8b5da3cb..9cc2d32983 100644
--- a/api-tests/src/steps/ipv-steps.ts
+++ b/api-tests/src/steps/ipv-steps.ts
@@ -111,18 +111,18 @@ const startNewJourney = async (
 };
 
 When(
-  /I activate the '([\w,]+)' feature set(?:s)?( along with the existing feature set(?:s)?)?/,
+  /I (override the existing feature set(?:s)? and )?activate the '([\w,]+)' feature set(?:s)?/,
   function (
     this: World,
-    featureSet: string,
-    addToExistingFeatureSets:
-      | " along with the existing feature set"
-      | " along with the existing feature sets"
+    overrideExistingFeatureSets:
+      | "override the existing feature set and "
+      | "override the existing feature sets and "
       | undefined,
+    featureSet: string,
   ) {
-    this.featureSet = addToExistingFeatureSets
-      ? this.featureSet + "," + featureSet
-      : featureSet;
+    this.featureSet = overrideExistingFeatureSets
+      ? featureSet
+      : this.featureSet + "," + featureSet;
   },
 );