Mandatory/explicit sample_transfer_path

gistfile1.txt

diff --git a/features/black_box/create-aip.feature b/features/black_box/create-aip.feature
index 60a2cf1..dc2843c 100644
--- a/features/black_box/create-aip.feature
+++ b/features/black_box/create-aip.feature
@@ -6,7 +6,7 @@ Alma wants to be able to create AIPs from all of Archivematica's different trans
 Background: The storage service is configured with a transfer source that can see the archivematica-sampledata repository.
 
   Scenario: Generate an AIP using a standard transfer workflow
-    Given an AIP has been created and stored
+    Given a "SampleTransfers/DemoTransferCSV" AIP has been created and stored
     When the AIP is downloaded
     Then the AIP METS can be accessed and parsed by mets-reader-writer
     And the AIP conforms to expected content and structure
diff --git a/features/black_box/reingest-aip.feature b/features/black_box/reingest-aip.feature
index 141e052..d68b82a 100644
--- a/features/black_box/reingest-aip.feature
+++ b/features/black_box/reingest-aip.feature
@@ -2,7 +2,7 @@
 Feature: Alma wants to be able to re-ingest an AIP and have the reingest recorded accurately in the AIP METS file.
 
   Scenario: Reingest without error
-    Given an AIP has been reingested
+    Given a "SampleTransfers/DemoTransferCSV" AIP has been reingested
     When the reingest has been processed
     Then the AIP can be successfully stored
     And there is a reingestion event for each original object in the AIP METS
diff --git a/features/black_box/transfer-microservices.feature b/features/black_box/transfer-microservices.feature
index 8eda8f0..4d5b3e9 100644
--- a/features/black_box/transfer-microservices.feature
+++ b/features/black_box/transfer-microservices.feature
@@ -2,7 +2,7 @@
 Feature: Alma wants to ensure that PREMIS events are recorded for all preservation events that occur during Transfer
 
   Scenario Outline: The minimum set of PREMIS events are recorded for a transfer
-    Given a <sample_transfer_path> AIP has been created and stored
+    Given a "<sample_transfer_path>" AIP has been created and stored
     When the AIP is downloaded
     Then there is a virus scanning event for each original object in the AIP METS
     And there is a message digest calculation event for each original object in the AIP METS
diff --git a/features/steps/black_box_steps.py b/features/steps/black_box_steps.py
index 294be62..4c4f0e3 100644
--- a/features/steps/black_box_steps.py
+++ b/features/steps/black_box_steps.py
@@ -41,26 +41,19 @@ def format_no_files_error(transfer):
     )
 
 
-use_step_matcher("re")
-
-
-@given("a.? (?P<sample_transfer_path>.*)AIP has been created and stored")
+@given('a "{sample_transfer_path}" AIP has been created and stored')
 def step_impl(context, sample_transfer_path):
-    sample_transfer_path = sample_transfer_path.strip()
-    if not sample_transfer_path:
-        sample_transfer_path = "SampleTransfers/DemoTransferCSV"
     transfer = utils.create_sample_transfer(
         context.api_clients_config, sample_transfer_path
     )
     context.current_transfer = transfer
 
 
-use_step_matcher("parse")
-
-
-@given("an AIP has been reingested")
-def step_impl(context):
-    context.execute_steps("Given an AIP has been created and stored\n")
+@given("a {sample_transfer_path} AIP has been reingested")
+def step_impl(context, sample_transfer_path):
+    context.execute_steps(
+        "Given a {} AIP has been created and stored\n".format(sample_transfer_path)
+    )
     reingest = utils.create_reingest(
         context.api_clients_config, context.current_transfer
     )