From 2221633e060e979b0bcbf4134c7f420815eb1847 Mon Sep 17 00:00:00 2001 From: Ajay Mudgal Date: Thu, 2 Jan 2025 23:28:36 +0000 Subject: [PATCH 1/6] Updating opening times in feature file scenarios --- .../features/F006_Opening_Times.feature | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/integration/features/F006_Opening_Times.feature b/test/integration/features/F006_Opening_Times.feature index f592daecc..a5676570e 100644 --- a/test/integration/features/F006_Opening_Times.feature +++ b/test/integration/features/F006_Opening_Times.feature @@ -33,12 +33,12 @@ Feature: F006. Opening times @complete @opening_times Scenario: F006SXX6. Confirm recently added specified opening date can be removed from Dos Given a basic service is created - And the change event is "open" on date "Jan 01 2025" + And the change event is "open" on date "Jan 01 2026" When the Changed Event is sent for processing with "valid" api key - Then DoS is open on "Jan 01 2025" + Then DoS is open on "Jan 01 2026" Given the change event has no specified opening dates When the Changed Event is sent for processing with "valid" api key - Then there is no longer a specified opening on "Jan 01 2025" + Then there is no longer a specified opening on "Jan 01 2026" And the service history is updated with the "removed" specified opening times @complete @opening_times @@ -55,29 +55,29 @@ Feature: F006. Opening times @complete @opening_times Scenario: F006SX8. Additional date changes open to closed Given an entry is created in the services table - And the service is "open" on date "Jan 01 2025" + And the service is "open" on date "Jan 01 2026" And the entry is committed to the services table - And the change event is "closed" on date "Jan 01 2025" + And the change event is "closed" on date "Jan 01 2026" When the Changed Event is sent for processing with "valid" api key - Then DoS is closed on "Jan 01 2025" + Then DoS is closed on "Jan 01 2026" @complete @opening_times Scenario: F006SX9. Additional date changes closed to open Given an entry is created in the services table - And the service is "closed" on date "Jan 01 2025" + And the service is "closed" on date "Jan 01 2026" And the entry is committed to the services table - And the change event is "open" on date "Jan 01 2025" + And the change event is "open" on date "Jan 01 2026" When the Changed Event is sent for processing with "valid" api key - Then DoS is open on "Jan 01 2025" + Then DoS is open on "Jan 01 2026" @complete @opening_times Scenario: F006SX10. Additional date changes times changed Given an entry is created in the services table - And the service is "open" on date "Jan 01 2025" + And the service is "open" on date "Jan 01 2026" And the entry is committed to the services table - And the change event specified opening is "open" from "10:00" to "16:00" on date "Jan 01 2025" + And the change event specified opening is "open" from "10:00" to "16:00" on date "Jan 01 2026" When the Changed Event is sent for processing with "valid" api key - Then DoS is open from "10:00" until "16:00" on "Jan 01 2025" + Then DoS is open from "10:00" until "16:00" on "Jan 01 2026" And the "service-sync" lambda does not show "report_key" with value "BLANK_STANDARD_OPENINGS" @complete @opening_times From ee1657f3c6bb2e97a5bee6ddacb4e89c02557e56 Mon Sep 17 00:00:00 2001 From: Ajay Mudgal Date: Fri, 3 Jan 2025 12:05:10 +0000 Subject: [PATCH 2/6] Empty commit to trigger build --- test/integration/steps/test_steps.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/integration/steps/test_steps.py b/test/integration/steps/test_steps.py index 22e82b410..eb1941de9 100644 --- a/test/integration/steps/test_steps.py +++ b/test/integration/steps/test_steps.py @@ -1908,3 +1908,5 @@ def _(context: Context, reason: str) -> Context: is True ), f"ERROR: {reason} logs found" return context + + \ No newline at end of file From 52a496f93108562e02a871bcc260c4918431417e Mon Sep 17 00:00:00 2001 From: Ajay Mudgal Date: Mon, 6 Jan 2025 11:22:07 +0000 Subject: [PATCH 3/6] Empty commit to debug build issue --- test/integration/features/F006_Opening_Times.feature | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/features/F006_Opening_Times.feature b/test/integration/features/F006_Opening_Times.feature index a5676570e..944e9f1e0 100644 --- a/test/integration/features/F006_Opening_Times.feature +++ b/test/integration/features/F006_Opening_Times.feature @@ -93,3 +93,4 @@ Feature: F006. Opening times Then the Changed Event is stored in dynamo db Then the DoS service has been updated with the specified date is captured by DoS And the service history is updated with the "added" specified opening times + From c8067048161a85eb4ce60408f3453f495e745785 Mon Sep 17 00:00:00 2001 From: Ajay Mudgal Date: Mon, 6 Jan 2025 12:42:05 +0000 Subject: [PATCH 4/6] Removing empty spaces to fix formatting issues --- test/integration/features/F006_Opening_Times.feature | 3 +-- test/integration/steps/test_steps.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/test/integration/features/F006_Opening_Times.feature b/test/integration/features/F006_Opening_Times.feature index 944e9f1e0..1b146ecc9 100644 --- a/test/integration/features/F006_Opening_Times.feature +++ b/test/integration/features/F006_Opening_Times.feature @@ -92,5 +92,4 @@ Feature: F006. Opening times When the Changed Event is sent for processing with "valid" api key Then the Changed Event is stored in dynamo db Then the DoS service has been updated with the specified date is captured by DoS - And the service history is updated with the "added" specified opening times - + And the service history is updated with the "added" specified opening times \ No newline at end of file diff --git a/test/integration/steps/test_steps.py b/test/integration/steps/test_steps.py index eb1941de9..ac8c97107 100644 --- a/test/integration/steps/test_steps.py +++ b/test/integration/steps/test_steps.py @@ -1907,6 +1907,4 @@ def _(context: Context, reason: str) -> Context: ) is True ), f"ERROR: {reason} logs found" - return context - - \ No newline at end of file + return context \ No newline at end of file From ee85f22537e43dca81f8bc75886b3b6c4c1361ce Mon Sep 17 00:00:00 2001 From: Ajay Mudgal Date: Mon, 6 Jan 2025 13:55:57 +0000 Subject: [PATCH 5/6] Fixing formatting issues --- test/integration/steps/test_steps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/steps/test_steps.py b/test/integration/steps/test_steps.py index ac8c97107..22e82b410 100644 --- a/test/integration/steps/test_steps.py +++ b/test/integration/steps/test_steps.py @@ -1907,4 +1907,4 @@ def _(context: Context, reason: str) -> Context: ) is True ), f"ERROR: {reason} logs found" - return context \ No newline at end of file + return context From 54d79211d9dc67f0ddfc21c7e037a369ade68513 Mon Sep 17 00:00:00 2001 From: Ajay Mudgal Date: Mon, 6 Jan 2025 15:05:56 +0000 Subject: [PATCH 6/6] Fixing formatting issue in feature file --- test/integration/features/F006_Opening_Times.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/features/F006_Opening_Times.feature b/test/integration/features/F006_Opening_Times.feature index 1b146ecc9..a5676570e 100644 --- a/test/integration/features/F006_Opening_Times.feature +++ b/test/integration/features/F006_Opening_Times.feature @@ -92,4 +92,4 @@ Feature: F006. Opening times When the Changed Event is sent for processing with "valid" api key Then the Changed Event is stored in dynamo db Then the DoS service has been updated with the specified date is captured by DoS - And the service history is updated with the "added" specified opening times \ No newline at end of file + And the service history is updated with the "added" specified opening times