From dd78dfa62f5c2bcc36f04f66b8613839a1ed3dd7 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 11 Dec 2025 00:53:24 +0000
Subject: [PATCH 01/25] Add in ambiguous step definitions

---
 compatibility/features/ambiguous/ambiguous_steps.rb | 9 +++++++++
 cucumber.gemspec                                    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 compatibility/features/ambiguous/ambiguous_steps.rb

diff --git a/compatibility/features/ambiguous/ambiguous_steps.rb b/compatibility/features/ambiguous/ambiguous_steps.rb
new file mode 100644
index 000000000..21161e30d
--- /dev/null
+++ b/compatibility/features/ambiguous/ambiguous_steps.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Given(/^a (.*?) with (.*?)$/) do |_arg1, _arg2|
+  # no-op
+end
+
+Given(/^a step with (.*)$/) do |_arg1|
+  # no-op
+end
diff --git a/cucumber.gemspec b/cucumber.gemspec
index 8162a1dfb..bbf926516 100644
--- a/cucumber.gemspec
+++ b/cucumber.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_test', '~> 1.1'
   s.add_dependency 'sys-uname', '~> 1.3'
 
-  s.add_development_dependency 'cucumber-compatibility-kit', '~> 20.0'
+  s.add_development_dependency 'cucumber-compatibility-kit', '~> 22.0'
   # Only needed whilst we are testing the formatters. Can be removed once we remove tests for those
   s.add_development_dependency 'nokogiri', '~> 1.15'
   s.add_development_dependency 'rake', '~> 13.2'

From 4b1f6c478293c07f6ba30a7ca4d72b58935f9368 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 11 Dec 2025 01:01:35 +0000
Subject: [PATCH 02/25] Add in global hooks cck examples and doc string
 primitive example

---
 .../features/doc-strings/doc-strings_steps.rb |  5 ++++
 .../global-hooks-afterall-error_steps.rb      | 25 +++++++++++++++++++
 .../global-hooks-attachments_steps.rb         | 13 ++++++++++
 .../global-hooks-beforeall-error_steps.rb     | 25 +++++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 compatibility/features/doc-strings/doc-strings_steps.rb
 create mode 100644 compatibility/features/global-hooks-afterall-error/global-hooks-afterall-error_steps.rb
 create mode 100644 compatibility/features/global-hooks-attachments/global-hooks-attachments_steps.rb
 create mode 100644 compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb

diff --git a/compatibility/features/doc-strings/doc-strings_steps.rb b/compatibility/features/doc-strings/doc-strings_steps.rb
new file mode 100644
index 000000000..a374b1c40
--- /dev/null
+++ b/compatibility/features/doc-strings/doc-strings_steps.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Given('a doc string:') do |doc_string|
+  # no-op
+end
diff --git a/compatibility/features/global-hooks-afterall-error/global-hooks-afterall-error_steps.rb b/compatibility/features/global-hooks-afterall-error/global-hooks-afterall-error_steps.rb
new file mode 100644
index 000000000..d72047878
--- /dev/null
+++ b/compatibility/features/global-hooks-afterall-error/global-hooks-afterall-error_steps.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+BeforeAll do
+  # no-op
+end
+
+BeforeAll do
+  raise 'BeforeAll hook went wrong'
+end
+
+BeforeAll do
+  # no-op
+end
+
+When('a step passes') do
+  # no-op
+end
+
+AfterAll do
+  # no-op
+end
+
+AfterAll do
+  # no-op
+end
diff --git a/compatibility/features/global-hooks-attachments/global-hooks-attachments_steps.rb b/compatibility/features/global-hooks-attachments/global-hooks-attachments_steps.rb
new file mode 100644
index 000000000..b2c272529
--- /dev/null
+++ b/compatibility/features/global-hooks-attachments/global-hooks-attachments_steps.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+BeforeAll do
+  attach('Attachment from BeforeAll hook', 'text/plain')
+end
+
+When('a step passes') do
+  # no-op
+end
+
+AfterAll do
+  attach('Attachment from AfterAll hook', 'text/plain')
+end
diff --git a/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb b/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb
new file mode 100644
index 000000000..bca4571e4
--- /dev/null
+++ b/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+BeforeAll do
+  # no-op
+end
+
+BeforeAll do
+  # no-op
+end
+
+When('a step passes') do
+  # no-op
+end
+
+AfterAll do
+  # no-op
+end
+
+AfterAll do
+  raise 'AfterAll hook went wrong'
+end
+
+AfterAll do
+  # no-op
+end

From 660007076d3c648239f8e3e78b3c435bf85b6943 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 11 Dec 2025 01:03:14 +0000
Subject: [PATCH 03/25] Add final global hooks test

---
 .../global-hooks/global-hooks_steps.rb        | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 compatibility/features/global-hooks/global-hooks_steps.rb

diff --git a/compatibility/features/global-hooks/global-hooks_steps.rb b/compatibility/features/global-hooks/global-hooks_steps.rb
new file mode 100644
index 000000000..993bc62c5
--- /dev/null
+++ b/compatibility/features/global-hooks/global-hooks_steps.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+BeforeAll do
+  # no-op
+end
+
+BeforeAll do
+  # no-op
+end
+
+When('a step passes') do
+  # no-op
+end
+
+When('a step fails') do
+  raise 'Exception in step'
+end
+
+AfterAll do
+  # no-op
+end
+
+AfterAll do
+  # no-op
+end

From 4c2101e78cc61a52ff9c3f2f05bf6bbdf230454d Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 11 Dec 2025 01:08:10 +0000
Subject: [PATCH 04/25] WIP fr minimal reversed feature Add in fix to test cck
 properly

---
 compatibility/cck_spec.rb                          | 14 +++++++++++---
 .../multiple-features-reversed/minimal_steps.rb    |  5 +++++
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 compatibility/features/multiple-features-reversed/minimal_steps.rb

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index d904dbf3f..0569a9136 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -3,7 +3,7 @@
 require_relative 'support/shared_examples'
 require_relative 'support/cck/examples'
 
-require 'cck/examples'
+require 'cucumber/compatibility_kit'
 
 # This is the implementation of the CCK testing for cucumber-ruby
 # It will run each example from the CCK that is of type "gherkin" (As "markdown" examples aren't implemented in ruby)
@@ -13,11 +13,19 @@
 describe CCK, :cck do
   let(:cucumber_command) { 'bundle exec cucumber --publish-quiet --profile none --format message' }
 
-  CCK::Examples.gherkin.each do |example_name|
+  CompatibilityKit.gherkin.each do |example_name|
     describe "'#{example_name}' example" do
       include_examples 'cucumber compatibility kit' do
         let(:example) { example_name }
-        let(:extra_args) { example == 'retry' ? '--retry 2' : '' }
+        let(:extra_args) do
+          if example == 'retry'
+            '--retry 2'
+          elsif example == 'multiple-features-reversed'
+            '--order reverse'
+          else
+            ''
+          end
+        end
         let(:support_code_path) { CCK::Examples.supporting_code_for(example) }
         let(:messages) { `#{cucumber_command} #{extra_args} --require #{support_code_path} #{cck_path}` }
       end
diff --git a/compatibility/features/multiple-features-reversed/minimal_steps.rb b/compatibility/features/multiple-features-reversed/minimal_steps.rb
new file mode 100644
index 000000000..65d5052d2
--- /dev/null
+++ b/compatibility/features/multiple-features-reversed/minimal_steps.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Given('I have {int} cukes in my belly') do |_cuke_count|
+  # no-op
+end

From 196627ff3f11f79b56e4f0ac4a933903faba8585 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 11 Dec 2025 01:14:29 +0000
Subject: [PATCH 05/25] Fix other ref to cck

---
 compatibility/support/shared_examples.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compatibility/support/shared_examples.rb b/compatibility/support/shared_examples.rb
index a9ebf8a99..6f2674dbe 100644
--- a/compatibility/support/shared_examples.rb
+++ b/compatibility/support/shared_examples.rb
@@ -10,7 +10,7 @@
 RSpec.shared_examples 'cucumber compatibility kit' do
   include CCK::Helpers
 
-  let(:cck_path) { CCK::Examples.feature_code_for(example) }
+  let(:cck_path) { CompatibilityKit.feature_code_for(example) }
 
   let(:parsed_original) { parse_ndjson_file("#{cck_path}/#{example}.ndjson") }
   let(:parsed_generated) { parse_ndjson(messages) }

From 4942c708840e28c3e0741cf4ba81e26eae89663d Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 11 Dec 2025 01:14:38 +0000
Subject: [PATCH 06/25] DRY up and use arguments file in cck proper

---
 compatibility/cck_spec.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index 0569a9136..c6ec32843 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -18,10 +18,8 @@
       include_examples 'cucumber compatibility kit' do
         let(:example) { example_name }
         let(:extra_args) do
-          if example == 'retry'
-            '--retry 2'
-          elsif example == 'multiple-features-reversed'
-            '--order reverse'
+          if File.exist?("#{cck_path}/#{example}.arguments.txt")
+            File.read("#{cck_path}/#{example}.arguments.txt")
           else
             ''
           end

From 910fb52a5c80dc8bdb6e53c3e4f633db954917b2 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 11 Dec 2025 01:34:32 +0000
Subject: [PATCH 07/25] Added all remaining step def code

---
 .../multiple-features-reversed/minimal_steps.rb     |  5 -----
 .../multiple-features-reversed_steps.rb             |  5 +++++
 .../multiple-features/multiple-features_steps.rb    |  5 +++++
 .../regular-expression/regular-expression_steps.rb  |  5 +++++
 .../rules-backgrounds/rules-backgrounds_steps.rb    | 13 +++++++++++++
 .../features/unused-steps/unused-steps_steps.rb     |  9 +++++++++
 6 files changed, 37 insertions(+), 5 deletions(-)
 delete mode 100644 compatibility/features/multiple-features-reversed/minimal_steps.rb
 create mode 100644 compatibility/features/multiple-features-reversed/multiple-features-reversed_steps.rb
 create mode 100644 compatibility/features/multiple-features/multiple-features_steps.rb
 create mode 100644 compatibility/features/regular-expression/regular-expression_steps.rb
 create mode 100644 compatibility/features/rules-backgrounds/rules-backgrounds_steps.rb
 create mode 100644 compatibility/features/unused-steps/unused-steps_steps.rb

diff --git a/compatibility/features/multiple-features-reversed/minimal_steps.rb b/compatibility/features/multiple-features-reversed/minimal_steps.rb
deleted file mode 100644
index 65d5052d2..000000000
--- a/compatibility/features/multiple-features-reversed/minimal_steps.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-Given('I have {int} cukes in my belly') do |_cuke_count|
-  # no-op
-end
diff --git a/compatibility/features/multiple-features-reversed/multiple-features-reversed_steps.rb b/compatibility/features/multiple-features-reversed/multiple-features-reversed_steps.rb
new file mode 100644
index 000000000..cd8682ffe
--- /dev/null
+++ b/compatibility/features/multiple-features-reversed/multiple-features-reversed_steps.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Given('an order for {string}') do |_item|
+  # no-op
+end
diff --git a/compatibility/features/multiple-features/multiple-features_steps.rb b/compatibility/features/multiple-features/multiple-features_steps.rb
new file mode 100644
index 000000000..cd8682ffe
--- /dev/null
+++ b/compatibility/features/multiple-features/multiple-features_steps.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Given('an order for {string}') do |_item|
+  # no-op
+end
diff --git a/compatibility/features/regular-expression/regular-expression_steps.rb b/compatibility/features/regular-expression/regular-expression_steps.rb
new file mode 100644
index 000000000..246e6e3e0
--- /dev/null
+++ b/compatibility/features/regular-expression/regular-expression_steps.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Given(/^a (.*?)(?: and a (.*?))?(?: and a (.*?))?$/) do |_vegetable1, _vegetable2, _vegetable3|
+  # no-op
+end
diff --git a/compatibility/features/rules-backgrounds/rules-backgrounds_steps.rb b/compatibility/features/rules-backgrounds/rules-backgrounds_steps.rb
new file mode 100644
index 000000000..3b5187169
--- /dev/null
+++ b/compatibility/features/rules-backgrounds/rules-backgrounds_steps.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+Given('an order for {string}') do |_item|
+  # no-op
+end
+
+When('an action') do
+  # no-op
+end
+
+Then('an outcome') do
+  # no-op
+end
diff --git a/compatibility/features/unused-steps/unused-steps_steps.rb b/compatibility/features/unused-steps/unused-steps_steps.rb
new file mode 100644
index 000000000..f06fdfa5f
--- /dev/null
+++ b/compatibility/features/unused-steps/unused-steps_steps.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Given('a step that is used') do
+  # no-op
+end
+
+Given('a step that is not used') do
+  # no-op
+end

From 885b9123969b3b962ded9efb1f616317dc829c9e Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 11 Dec 2025 01:52:02 +0000
Subject: [PATCH 08/25] Alleviate issue with extra args not appearing at end by
 forcibly moving them to end

---
 compatibility/cck_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index c6ec32843..efb938d7f 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -13,19 +13,19 @@
 describe CCK, :cck do
   let(:cucumber_command) { 'bundle exec cucumber --publish-quiet --profile none --format message' }
 
-  CompatibilityKit.gherkin.each do |example_name|
+  ['retry', 'ambiguous'].each do |example_name|
     describe "'#{example_name}' example" do
       include_examples 'cucumber compatibility kit' do
         let(:example) { example_name }
         let(:extra_args) do
           if File.exist?("#{cck_path}/#{example}.arguments.txt")
-            File.read("#{cck_path}/#{example}.arguments.txt")
+            File.read("#{cck_path}/#{example}.arguments.txt").to_s
           else
             ''
           end
         end
         let(:support_code_path) { CCK::Examples.supporting_code_for(example) }
-        let(:messages) { `#{cucumber_command} #{extra_args} --require #{support_code_path} #{cck_path}` }
+        let(:messages) { `#{cucumber_command} --require #{support_code_path} #{cck_path} #{extra_args}` }
       end
     end
   end

From 63403a9f1532d7612a51fa58235f07bffcf13cab Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Tue, 16 Dec 2025 18:45:42 +0000
Subject: [PATCH 09/25] Added changelog message;

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f07d8109..1b6411e05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) for more info on how to contribute to Cucumber.
 
 ## [Unreleased]
+### Added
+- Add timestamp to `Attachment` message
 
 ## [10.2.0] - 2025-12-10
 ### Changed

From bf0988719a00cf65420848f0f274b7d5896a37cb Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Tue, 16 Dec 2025 18:52:48 +0000
Subject: [PATCH 10/25] Added extra cck retry steps

---
 compatibility/features/retry/retry_steps.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/compatibility/features/retry/retry_steps.rb b/compatibility/features/retry/retry_steps.rb
index c31a0aa63..d042e9304 100644
--- a/compatibility/features/retry/retry_steps.rb
+++ b/compatibility/features/retry/retry_steps.rb
@@ -19,3 +19,15 @@
 Given('a step that always fails') do
   raise 'Exception in step'
 end
+
+Given('an ambiguous step') do
+  # first one
+end
+
+Given('an ambiguous step') do
+  # second one
+end
+
+Given('a pending step') do
+  pending('')
+end

From e656a8f1beac880beb3507f2507799096e5006ce Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Tue, 13 Jan 2026 00:26:10 +0000
Subject: [PATCH 11/25] Document current status quo of cck compliance /
 conformance and enable each failing item to be queried and ran in isolation
 easily

---
 compatibility/cck_spec.rb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index efb938d7f..78d22f5de 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -13,7 +13,24 @@
 describe CCK, :cck do
   let(:cucumber_command) { 'bundle exec cucumber --publish-quiet --profile none --format message' }
 
-  ['retry', 'ambiguous'].each do |example_name|
+  # CCK v22 conformance status update - Jan 2026
+  # OVERALL: 93 examples, 15 failures, 78 passed
+  # SANITIZED: 69 examples, 0 failures, 69 passed
+
+  items_to_fix =
+    %w[
+      ambiguous
+      backgrounds
+      global-hooks
+      global-hooks-afterall-error
+      global-hooks-attachments
+      global-hooks-beforeall-error
+      multiple-features-reversed
+      retry
+    ]
+  _failing, passing = CompatibilityKit.gherkin.partition { |name| items_to_fix.include?(name) }
+
+  passing.each do |example_name|
     describe "'#{example_name}' example" do
       include_examples 'cucumber compatibility kit' do
         let(:example) { example_name }

From a9dea52bc3827266812fe725a6754ceee12f0456 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 15 Jan 2026 23:00:34 +0000
Subject: [PATCH 12/25] Fix up namespace to align

---
 compatibility/cck_spec.rb                  |  2 +-
 compatibility/spec/cck/examples_spec.rb    |  2 +-
 compatibility/support/cck/examples.rb      | 21 ---------------------
 compatibility/support/compatibility_kit.rb | 19 +++++++++++++++++++
 4 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 compatibility/support/cck/examples.rb
 create mode 100644 compatibility/support/compatibility_kit.rb

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index 78d22f5de..95318d34a 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'support/shared_examples'
-require_relative 'support/cck/examples'
+require_relative 'support/compatibility_kit'
 
 require 'cucumber/compatibility_kit'
 
diff --git a/compatibility/spec/cck/examples_spec.rb b/compatibility/spec/cck/examples_spec.rb
index 97cb995da..00e612a24 100644
--- a/compatibility/spec/cck/examples_spec.rb
+++ b/compatibility/spec/cck/examples_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../support/cck/examples'
+require_relative '../../support/cck/atibility_kit'
 
 describe CCK::Examples do
   let(:features_path) { File.expand_path("#{File.dirname(__FILE__)}/../../features") }
diff --git a/compatibility/support/cck/examples.rb b/compatibility/support/cck/examples.rb
deleted file mode 100644
index 27923826c..000000000
--- a/compatibility/support/cck/examples.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module CCK
-  module Examples
-    class << self
-      def supporting_code_for(example_name)
-        path = File.join(local_features_folder_location, example_name)
-
-        return path if File.directory?(path)
-
-        raise ArgumentError, "No supporting code directory found locally for CCK example: #{example_name}"
-      end
-
-      private
-
-      def local_features_folder_location
-        File.expand_path("#{File.dirname(__FILE__)}/../../features/")
-      end
-    end
-  end
-end
diff --git a/compatibility/support/compatibility_kit.rb b/compatibility/support/compatibility_kit.rb
new file mode 100644
index 000000000..934214a0b
--- /dev/null
+++ b/compatibility/support/compatibility_kit.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class CompatibilityKit
+  class << self
+    def supporting_code_for(example_name)
+      path = File.join(local_features_folder_location, example_name)
+
+      return path if File.directory?(path)
+
+      raise ArgumentError, "No supporting code directory found locally for CCK example: #{example_name}"
+    end
+
+    private
+
+    def local_features_folder_location
+      File.expand_path("#{File.dirname(__FILE__)}/../../features/")
+    end
+  end
+end

From e30b1f73344e2d6a330bf793d305424e8e7cccc6 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 15 Jan 2026 23:32:27 +0000
Subject: [PATCH 13/25] Fix bad replace on require path

---
 compatibility/cck_spec.rb                  | 2 +-
 compatibility/spec/cck/examples_spec.rb    | 2 +-
 compatibility/support/compatibility_kit.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index 95318d34a..566ab17a9 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -41,7 +41,7 @@
             ''
           end
         end
-        let(:support_code_path) { CCK::Examples.supporting_code_for(example) }
+        let(:support_code_path) { CompatibilityKit.supporting_code_for(example) }
         let(:messages) { `#{cucumber_command} --require #{support_code_path} #{cck_path} #{extra_args}` }
       end
     end
diff --git a/compatibility/spec/cck/examples_spec.rb b/compatibility/spec/cck/examples_spec.rb
index 00e612a24..c282e010b 100644
--- a/compatibility/spec/cck/examples_spec.rb
+++ b/compatibility/spec/cck/examples_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../support/cck/atibility_kit'
+require_relative '../../support/compatibility_kit'
 
 describe CCK::Examples do
   let(:features_path) { File.expand_path("#{File.dirname(__FILE__)}/../../features") }
diff --git a/compatibility/support/compatibility_kit.rb b/compatibility/support/compatibility_kit.rb
index 934214a0b..70b0b8c63 100644
--- a/compatibility/support/compatibility_kit.rb
+++ b/compatibility/support/compatibility_kit.rb
@@ -13,7 +13,7 @@ def supporting_code_for(example_name)
     private
 
     def local_features_folder_location
-      File.expand_path("#{File.dirname(__FILE__)}/../../features/")
+      File.expand_path("#{File.dirname(__FILE__)}/../features/")
     end
   end
 end

From aac36c701a71d4e2175e78427ee9609f36b5df91 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 15 Jan 2026 23:35:44 +0000
Subject: [PATCH 14/25] Fix compatibilitykit tests;

---
 .../{cck/examples_spec.rb => compatibility_kit_spec.rb}   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename compatibility/spec/{cck/examples_spec.rb => compatibility_kit_spec.rb} (80%)

diff --git a/compatibility/spec/cck/examples_spec.rb b/compatibility/spec/compatibility_kit_spec.rb
similarity index 80%
rename from compatibility/spec/cck/examples_spec.rb
rename to compatibility/spec/compatibility_kit_spec.rb
index c282e010b..10aab51c4 100644
--- a/compatibility/spec/cck/examples_spec.rb
+++ b/compatibility/spec/compatibility_kit_spec.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../support/compatibility_kit'
+require_relative '../support/compatibility_kit'
 
-describe CCK::Examples do
-  let(:features_path) { File.expand_path("#{File.dirname(__FILE__)}/../../features") }
+describe CompatibilityKit do
+  let(:features_path) { File.expand_path("#{File.dirname(__FILE__)}/../features") }
 
-  describe '#supporting_code_for' do
+  describe '.supporting_code_for' do
     context 'with an example that exists' do
       it 'returns the path of the folder containing the supporting code for the example' do
         expect(described_class.supporting_code_for('hooks')).to eq("#{features_path}/hooks")

From aa93bb07b6446a8b27d63ed327c986828cc042ef Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Thu, 15 Jan 2026 23:47:11 +0000
Subject: [PATCH 15/25] Skip flaky test on JRuby

---
 spec/cucumber/query_spec.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/cucumber/query_spec.rb b/spec/cucumber/query_spec.rb
index e64537559..d238633bf 100644
--- a/spec/cucumber/query_spec.rb
+++ b/spec/cucumber/query_spec.rb
@@ -56,7 +56,10 @@ def list_of_tests
       let(:cck_messages) { parse_ndjson_file(test[:cck_spec]).map.itself }
       let(:filename_to_check) { test[:cck_spec].sub('.ndjson', ".#{test[:query_name]}.results.json") }
 
-      before { cck_messages.each { |message| repository.update(message) } }
+      before do
+        skip('These tests will not pass on JRuby') if Cucumber::JRUBY
+        cck_messages.each { |message| repository.update(message) }
+      end
 
       it 'returns the expected query result' do
         evaluated_query = test[:query_proc].call(query)

From c09411898c7d5dde8df4d881d3fb17700eaea490 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Mon, 2 Mar 2026 07:03:41 +0000
Subject: [PATCH 16/25] Add override for CCK v29 issue for one specific error
 (Children being ommitted too early)

---
 compatibility/support/cck/keys_checker.rb        | 3 +++
 compatibility/support/cck/messages_comparator.rb | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/compatibility/support/cck/keys_checker.rb b/compatibility/support/cck/keys_checker.rb
index 98177194d..17416d6ad 100644
--- a/compatibility/support/cck/keys_checker.rb
+++ b/compatibility/support/cck/keys_checker.rb
@@ -17,6 +17,9 @@ def compare
       return if identical_keys?
       return "Detected extra keys in message #{message_name}: #{extra_keys}" if extra_keys.any?
 
+      # TODO: Remove this override when the CCK is being checked at v29+
+      return if missing_keys == [:children]
+
       "Missing keys in message #{message_name}: #{missing_keys}" if missing_keys.any?
     rescue StandardError => e
       ["Unexpected error: #{e.message}"]
diff --git a/compatibility/support/cck/messages_comparator.rb b/compatibility/support/cck/messages_comparator.rb
index e5c4bac36..971af63ad 100644
--- a/compatibility/support/cck/messages_comparator.rb
+++ b/compatibility/support/cck/messages_comparator.rb
@@ -24,7 +24,12 @@ def compare(detected, expected)
       detected_by_type.each_key do |type|
         compare_list(detected_by_type[type], expected_by_type[type])
       rescue StandardError => e
-        all_errors << "Error while comparing #{type}: #{e.message}"
+        # TODO: Remove this override when the CCK is being checked at v29+
+        if e.message.include?('each_with_index')
+          :ignore_until_cck_v29
+        else
+          all_errors << "Error while comparing #{type}: #{e.message}"
+        end
       end
     end
 

From 76fe9d13dfb19bb9aa4352f512862a6815aea442 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Mon, 2 Mar 2026 07:05:13 +0000
Subject: [PATCH 17/25] Enable 2 more CCK examples now the code has been
 implemented

---
 compatibility/cck_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index 566ab17a9..48e5c4a44 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -19,13 +19,11 @@
 
   items_to_fix =
     %w[
-      ambiguous
       backgrounds
       global-hooks
       global-hooks-afterall-error
       global-hooks-attachments
       global-hooks-beforeall-error
-      multiple-features-reversed
       retry
     ]
   _failing, passing = CompatibilityKit.gherkin.partition { |name| items_to_fix.include?(name) }

From 226f7f239a08cdff1a2aeba509cef1e184a3f2e3 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Mon, 2 Mar 2026 07:08:11 +0000
Subject: [PATCH 18/25] Retry is also fixed

---
 compatibility/cck_spec.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index 48e5c4a44..64c844ad7 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -13,9 +13,9 @@
 describe CCK, :cck do
   let(:cucumber_command) { 'bundle exec cucumber --publish-quiet --profile none --format message' }
 
-  # CCK v22 conformance status update - Jan 2026
-  # OVERALL: 93 examples, 15 failures, 78 passed
-  # SANITIZED: 69 examples, 0 failures, 69 passed
+  # CCK v22 conformance status update - Mar 2026
+  # OVERALL: 93 examples, 10 failures, 83 passed
+  # SANITIZED: 78 examples, 0 failures, 78 passed
 
   items_to_fix =
     %w[
@@ -24,7 +24,6 @@
       global-hooks-afterall-error
       global-hooks-attachments
       global-hooks-beforeall-error
-      retry
     ]
   _failing, passing = CompatibilityKit.gherkin.partition { |name| items_to_fix.include?(name) }
 

From d531a73b275d7f5ce2b2a623c9e14213ebd8aa70 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Tue, 17 Mar 2026 15:54:15 +0000
Subject: [PATCH 19/25] Add missing steps for backgrounds feature

---
 .../features/backgrounds/backgrounds_steps.rb       | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 compatibility/features/backgrounds/backgrounds_steps.rb

diff --git a/compatibility/features/backgrounds/backgrounds_steps.rb b/compatibility/features/backgrounds/backgrounds_steps.rb
new file mode 100644
index 000000000..55e3e52b4
--- /dev/null
+++ b/compatibility/features/backgrounds/backgrounds_steps.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+Given('an order for {string}') do |_arg1|
+  # no-op
+end
+
+When('an action') do
+  # no-op
+end
+
+Then('an outcome') do
+  # no-op
+end

From b8a0f81b2e9ebe018c76e85f26b8a9fbae579bfb Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Tue, 17 Mar 2026 22:48:48 +0000
Subject: [PATCH 20/25] Mark backgrounds tests for CCK as passing

---
 compatibility/cck_spec.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index 64c844ad7..cff38a3bb 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -14,20 +14,19 @@
   let(:cucumber_command) { 'bundle exec cucumber --publish-quiet --profile none --format message' }
 
   # CCK v22 conformance status update - Mar 2026
-  # OVERALL: 93 examples, 10 failures, 83 passed
-  # SANITIZED: 78 examples, 0 failures, 78 passed
+  # OVERALL: 93 examples, 7 failures, 86 passed
+  # SANITIZED: 81 examples, 0 failures, 81 passed
 
   items_to_fix =
     %w[
-      backgrounds
       global-hooks
       global-hooks-afterall-error
       global-hooks-attachments
       global-hooks-beforeall-error
     ]
-  _failing, passing = CompatibilityKit.gherkin.partition { |name| items_to_fix.include?(name) }
+  failing, passing = CompatibilityKit.gherkin.partition { |name| items_to_fix.include?(name) }
 
-  passing.each do |example_name|
+  failing.each do |example_name|
     describe "'#{example_name}' example" do
       include_examples 'cucumber compatibility kit' do
         let(:example) { example_name }

From 32444622045c932e3255da3a304104d1ee6b2c9c Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Tue, 17 Mar 2026 22:50:34 +0000
Subject: [PATCH 21/25] Fix before all and after all steps

---
 .../global-hooks-afterall-error_steps.rb                  | 8 ++++----
 .../global-hooks-beforeall-error_steps.rb                 | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/compatibility/features/global-hooks-afterall-error/global-hooks-afterall-error_steps.rb b/compatibility/features/global-hooks-afterall-error/global-hooks-afterall-error_steps.rb
index d72047878..bca4571e4 100644
--- a/compatibility/features/global-hooks-afterall-error/global-hooks-afterall-error_steps.rb
+++ b/compatibility/features/global-hooks-afterall-error/global-hooks-afterall-error_steps.rb
@@ -4,10 +4,6 @@
   # no-op
 end
 
-BeforeAll do
-  raise 'BeforeAll hook went wrong'
-end
-
 BeforeAll do
   # no-op
 end
@@ -20,6 +16,10 @@
   # no-op
 end
 
+AfterAll do
+  raise 'AfterAll hook went wrong'
+end
+
 AfterAll do
   # no-op
 end
diff --git a/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb b/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb
index bca4571e4..a89ea23a5 100644
--- a/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb
+++ b/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb
@@ -4,6 +4,10 @@
   # no-op
 end
 
+BeforeAll do
+  raise 'BeforeAll hook went wrong'
+end
+
 BeforeAll do
   # no-op
 end

From e058d641a0e657360b446ac857278acc593e258b Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Tue, 17 Mar 2026 23:57:28 +0000
Subject: [PATCH 22/25] Fix up rubocop TODO

---
 .rubocop_todo.yml | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4f6db6d91..218257cc1 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-03-17 23:06:46 UTC using RuboCop version 1.85.1.
+# on 2026-03-17 23:57:03 UTC using RuboCop version 1.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -10,7 +10,7 @@
 # TODO - [LH] -> Mar '25 (v10 prep) - 370 files inspected, 721 offenses detected, 116 offenses autocorrectable
 # TODO - [LH] -> Dec '25 - 375 files inspected, 713 offenses detected, 109 offenses autocorrectable
 # TODO - [LH] -> Dec '25 (query prep) - 378 files inspected, 729 offenses detected, 109 offenses autocorrectable
-# TODO - [LH] -> Mar '26 (v11 prep) - 378 files inspected, 732 offenses detected, 109 offenses autocorrectable
+# TODO - [LH] -> Mar '26 (v11 prep) - 389 files inspected, 747 offenses detected, 108 offenses autocorrectable
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -39,6 +39,12 @@ Lint/UselessAccessModifier:
   Exclude:
     - 'lib/cucumber/formatter/curl_option_parser.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/UselessAssignment:
+  Exclude:
+    - 'compatibility/cck_spec.rb'
+
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/UselessMethodDefinition:
@@ -66,12 +72,12 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 12
 
-# Offense count: 82
+# Offense count: 83
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 65
 
-# Offense count: 14
+# Offense count: 12
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
   Max: 804
@@ -181,7 +187,7 @@ RSpec/ExpectOutput:
   Exclude:
     - 'spec/cucumber/formatter/interceptor_spec.rb'
 
-# Offense count: 61
+# Offense count: 58
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, each, example
@@ -195,15 +201,22 @@ RSpec/IndexedLet:
     - 'spec/cucumber/filters/retry_spec.rb'
     - 'spec/cucumber/glue/registry_and_more_spec.rb'
 
-# Offense count: 52
+# Offense count: 64
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
+    - 'spec/cucumber/cli/options_spec.rb'
     - 'spec/cucumber/formatter/interceptor_spec.rb'
     - 'spec/cucumber/formatter/json_spec.rb'
     - 'spec/cucumber/formatter/query/hook_by_test_step_spec.rb'
     - 'spec/support/shared_context/http_server.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/LeadingSubject:
+  Exclude:
+    - 'spec/cucumber/cli/main_spec.rb'
+
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/MatchArray:
@@ -229,7 +242,7 @@ RSpec/MissingExampleGroupArgument:
 RSpec/MultipleExpectations:
   Max: 3
 
-# Offense count: 39
+# Offense count: 37
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 10
@@ -254,10 +267,10 @@ RSpec/NamedSubject:
     - 'spec/cucumber/runtime/support_code_spec.rb'
     - 'spec/cucumber/runtime_spec.rb'
 
-# Offense count: 2
+# Offense count: 8
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
-  Max: 4
+  Max: 5
 
 # Offense count: 22
 # Configuration parameters: AllowedPatterns.
@@ -295,11 +308,12 @@ RSpec/ScatteredLet:
   Exclude:
     - 'spec/cucumber/runtime/support_code_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
 # SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Exclude:
+    - 'spec/cucumber/cli/rerun_spec.rb'
     - 'spec/cucumber/formatter/interceptor_spec.rb'
 
 # Offense count: 7

From ab563afe24a7d735050bf508edc1004866578833 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Tue, 17 Mar 2026 23:58:19 +0000
Subject: [PATCH 23/25] Switch CI to only run passing scenarios

---
 compatibility/cck_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index cff38a3bb..3eaebf3df 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -26,7 +26,7 @@
     ]
   failing, passing = CompatibilityKit.gherkin.partition { |name| items_to_fix.include?(name) }
 
-  failing.each do |example_name|
+  passing.each do |example_name|
     describe "'#{example_name}' example" do
       include_examples 'cucumber compatibility kit' do
         let(:example) { example_name }

From 99ead9c0b9aa7ccc7f9f62818f13c3b8007ff1ed Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Wed, 18 Mar 2026 00:29:25 +0000
Subject: [PATCH 24/25] Remove superfluous hook

---
 .../global-hooks-beforeall-error_steps.rb                     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb b/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb
index a89ea23a5..d72047878 100644
--- a/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb
+++ b/compatibility/features/global-hooks-beforeall-error/global-hooks-beforeall-error_steps.rb
@@ -20,10 +20,6 @@
   # no-op
 end
 
-AfterAll do
-  raise 'AfterAll hook went wrong'
-end
-
 AfterAll do
   # no-op
 end

From 8573bdafd4f2dad192bbf08d62c94715a7eb3c57 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Wed, 18 Mar 2026 00:38:41 +0000
Subject: [PATCH 25/25] Add debugging notes about missing message count

---
 compatibility/cck_spec.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compatibility/cck_spec.rb b/compatibility/cck_spec.rb
index 3eaebf3df..354a7da84 100644
--- a/compatibility/cck_spec.rb
+++ b/compatibility/cck_spec.rb
@@ -17,6 +17,11 @@
   # OVERALL: 93 examples, 7 failures, 86 passed
   # SANITIZED: 81 examples, 0 failures, 81 passed
 
+  # Global Hooks -> 23 messages generated - Expected 31 (Missing 4 testRunHookStarted + 4 testRunHookFinished)
+  # Global Hooks Before All -> 0 messages generated - Expected 22
+  # Global Hooks Attachments -> 0 messages generated - Expected 20
+  # Global Hooks After All -> 17 messages generated - Expected 27 (Missing 5 testRunHookStarted + 5 testRunHookFinished)
+
   items_to_fix =
     %w[
       global-hooks
@@ -26,7 +31,7 @@
     ]
   failing, passing = CompatibilityKit.gherkin.partition { |name| items_to_fix.include?(name) }
 
-  passing.each do |example_name|
+  failing.each do |example_name|
     describe "'#{example_name}' example" do
       include_examples 'cucumber compatibility kit' do
         let(:example) { example_name }