From fd48b9ef3f8c573cdf1097a7394bbcc00e77a242 Mon Sep 17 00:00:00 2001
From: Joel Sugarman <joel.sugarman@digital.justice.gov.uk>
Date: Tue, 7 Jan 2025 13:47:02 +0000
Subject: [PATCH] AP-5659: Use cucumber `main` branch temporarily

Until cucumber 10 is released there is an error:

```shell
<internal:hash>:37:in 'initialize': unknown keywords: :strict, :proc (ArgumentError)
```

This [issue](https://github.com/cucumber/cucumber-ruby/issues/1769) covers the issue and mentions
main is fixed. So can use that to unblock us?!
---
 Gemfile      |  8 +++++++-
 Gemfile.lock | 53 ++++++++++++++++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6bd7cc156f..6437a7ede7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -141,8 +141,14 @@ group :test do
       require: "action_dispatch/testing/integration/capybara/rspec"
   gem "axe-core-cucumber"
   gem "capybara", ">= 3.36.0", "< 4.0"
-  gem "cucumber", require: false
+
+  # replace with cucumber 9.2.1 or 10 when released
+  # see https://github.com/cucumber/cucumber-ruby/issues/1769
+  #
+  gem "cucumber", require: false, git: "https://github.com/cucumber/cucumber-ruby.git", branch: "main"
+  gem "cucumber-core", require: false, git: "https://github.com/cucumber/cucumber-ruby-core.git", branch: "main"
   gem "cucumber-rails", ">= 2.4.0", require: false
+
   gem "database_cleaner"
   gem "launchy"
   gem "puffing-billy", ">= 4.0.0", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 64c69c1d18..f202d28649 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,31 @@
+GIT
+  remote: https://github.com/cucumber/cucumber-ruby-core.git
+  revision: 532112068f52798ad31a15fd5d4934fed2ed03a2
+  branch: main
+  specs:
+    cucumber-core (15.0.0)
+      cucumber-gherkin (> 27, < 30)
+      cucumber-messages (> 25, < 28)
+      cucumber-tag-expressions (> 5, < 7)
+
+GIT
+  remote: https://github.com/cucumber/cucumber-ruby.git
+  revision: 89b8990319ed9fb5b059255ee16e2c8a3c1c6631
+  branch: main
+  specs:
+    cucumber (9.2.0)
+      base64 (~> 0.2)
+      builder (~> 3.2)
+      cucumber-ci-environment (> 9, < 11)
+      cucumber-core (~> 15.0)
+      cucumber-cucumber-expressions (~> 17.0)
+      cucumber-html-formatter (> 20.3, < 22)
+      diff-lcs (~> 1.5)
+      logger (~> 1.6)
+      mini_mime (~> 1.1)
+      multi_test (~> 1.1)
+      sys-uname (~> 1.3)
+
 GIT
   remote: https://github.com/dev-develop/ruby-saml-idp.git
   revision: e8c9ba90a0f868e03d033133df1d2b035b9b65a9
@@ -183,30 +211,14 @@ GEM
     cssbundling-rails (1.4.1)
       railties (>= 6.0.0)
     csv (3.3.2)
-    cucumber (9.2.0)
-      builder (~> 3.2)
-      cucumber-ci-environment (> 9, < 11)
-      cucumber-core (> 13, < 14)
-      cucumber-cucumber-expressions (~> 17.0)
-      cucumber-gherkin (> 24, < 28)
-      cucumber-html-formatter (> 20.3, < 22)
-      cucumber-messages (> 19, < 25)
-      diff-lcs (~> 1.5)
-      mini_mime (~> 1.1)
-      multi_test (~> 1.1)
-      sys-uname (~> 1.2)
     cucumber-ci-environment (10.0.1)
-    cucumber-core (13.0.3)
-      cucumber-gherkin (>= 27, < 28)
-      cucumber-messages (>= 20, < 23)
-      cucumber-tag-expressions (> 5, < 7)
     cucumber-cucumber-expressions (17.1.0)
       bigdecimal
-    cucumber-gherkin (27.0.0)
-      cucumber-messages (>= 19.1.4, < 23)
+    cucumber-gherkin (29.0.0)
+      cucumber-messages (> 25, < 26)
     cucumber-html-formatter (21.7.0)
       cucumber-messages (> 19, < 27)
-    cucumber-messages (22.0.0)
+    cucumber-messages (25.0.1)
     cucumber-rails (3.1.0)
       capybara (>= 3.11, < 4)
       cucumber (>= 5, < 10)
@@ -778,7 +790,8 @@ DEPENDENCIES
   capybara (>= 3.36.0, < 4.0)
   cssbundling-rails
   csv
-  cucumber
+  cucumber!
+  cucumber-core!
   cucumber-rails (>= 2.4.0)
   database_cleaner
   devise