cucumber-wire 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd0ef9db88f635f118ea111bfcacf07c78c9ba12188bf9665f1295b1a62c109
-  data.tar.gz: d6711c945d6dc8d73df55acd712857ccea77f1ef61cbdc31acedda8f7f159236
+  metadata.gz: 130cb3e95181e3075510187b0744f75c054ee7262cd959d702cf46530b933ea3
+  data.tar.gz: 80ca9b30f9a5eab812757808107fdb84560538fb96cc896c7b70278038f95a4d
 SHA512:
-  metadata.gz: 3f8e6bfcdd0864a50bf3213cbe4704308100fa67affdf4cb945646433bf9f3434d943dfb04429f15a1be8c12b3ada3f2bea39f750ea2b5f4f693063180fb7c2c
-  data.tar.gz: b19e74fb0b2ed1ed30fd0fb027569982f67128bc749e7d006eec7cf7e54607651a07a83e9fa0f5f19d64596172308481b04c222712dcab94fc92901745223306
+  metadata.gz: a4071edb6e2ee0ebafee6ed6be51ab2d5c04683ce1eaacd475c0f4db55ee6a18a16cf13b5e6f7e44a70c8969de4e30fbd9a872f8124bc280c94be274fc06bf9d
+  data.tar.gz: 3010136c5cda24d87f1bca45e8d13a0839505d5e74f8a66df6b63e0318ac79d816f30c4a11b94665182e399107b5476bb5ba4b2375419e5c0e6a1852375e055b

data/CHANGELOG.md

@@ -18,6 +18,16 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
 
 ### Removed
 
+## [6.2.1]
+
+### Fixed
+
+- Fix usage with message-related formatters like the html formatter
+  ([PR#57](https://github.com/cucumber/cucumber-ruby-wire/pull/57)
+   [Issue#56](https://github.com/cucumber/cucumber-ruby-wire/issues/56))
+
+- Removed dependency to cucumber-messages
+
 ## [6.2.0]
 
 ### Changed
@@ -107,7 +117,8 @@ is a risk of regressions.
 - Changes to work with a modern Cucumber-Ruby ([#14](https://github.com/cucumber/cucumber-ruby-wire/pull/14) [brasmusson](https://github.com/brasmusson))
 - Adapt to the move of Location to Cucumber::Core::Test ([#14](https://github.com/cucumber/cucumber-ruby-wire/pull/14) [brasmusson](https://github.com/brasmusson))
 
-[Unreleased]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.2.0...main
+[Unreleased]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.2.1...main
+[6.2.1]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.2.0...v6.2.1
 [6.2.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.1.1...v6.2.0
 [6.1.1]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.1.0...v6.1.1
 [6.1.0]: https://github.com/cucumber/cucumber-ruby-wire/compare/v6.0.1...v6.1.0

data/lib/cucumber/wire/add_hooks_filter.rb

@@ -1,5 +1,4 @@
 # coding: utf-8
-require 'cucumber/messages'
 
 module Cucumber
   module Wire
@@ -13,19 +12,45 @@ module Cucumber
       def before_hook(test_case)
         # TODO: is this dependency on Cucumber::Hooks OK? Feels a bit internal..
         # TODO: how do we express the location of the hook? Should we create one hook per connection so we can use the host:port of the connection?
-        Cucumber::Hooks.before_hook(id_generator.new_id, Core::Test::Location.new('TODO:wire')) do
-          connections.begin_scenario(test_case)
-        end
+
+        hook = instanciate_wire_hook(:begin_scenario)
+        action = ->(result) { hook.invoke('Before', [Cucumber::RunningTestCase.new(test_case).with_result(result), connections]) }
+
+        hook_step = Cucumber::Hooks.before_hook(id_generator.new_id, Core::Test::Location.new('wire'), &action)
+
+        configuration.event_bus.hook_test_step_created(hook_step, hook)
+
+        hook_step
       end
 
       def after_hook(test_case)
-        Cucumber::Hooks.after_hook(id_generator.new_id, Core::Test::Location.new('TODO:wire')) do
-          connections.end_scenario(test_case)
-        end
+        hook = instanciate_wire_hook(:end_scenario)
+        action = ->(result) { hook.invoke('After', [Cucumber::RunningTestCase.new(test_case).with_result(result), connections]) }
+
+        hook_step = Cucumber::Hooks.after_hook(id_generator.new_id, Core::Test::Location.new('wire'), &action)
+
+        configuration.event_bus.hook_test_step_created(hook_step, hook)
+
+        hook_step
       end
 
       def id_generator
-        @id_generator ||= Cucumber::Messages::IdGenerator::UUID.new
+        @id_generator ||= connections.configuration.id_generator
+      end
+
+      def configuration
+        @configuration ||= connections.configuration
+      end
+
+      private
+
+      def instanciate_wire_hook(hook_method)
+        Cucumber::Glue::Hook.new(
+          id_generator.new_id,
+          connections.registry,
+          [],
+          ->(test_case, connections) { connections.send(hook_method, test_case) }
+        )
       end
     end
   end

data/lib/cucumber/wire/connections.rb

@@ -13,7 +13,7 @@ module Cucumber
   module Wire
 
     class Connections
-      attr_reader :connections
+      attr_reader :connections, :configuration, :registry
       private :connections
 
       def initialize(connections, configuration, registry)
@@ -45,7 +45,6 @@ module Cucumber
       def snippets(code_keyword, step_name, multiline_arg_class_name)
         connections.map { |c| c.snippet_text(code_keyword, step_name, multiline_arg_class_name) }.flatten
       end
-
     end
   end
 end

data/lib/cucumber/wire/step_definition.rb

@@ -3,7 +3,7 @@ require 'cucumber/core/test/location'
 module Cucumber
   module Wire
     class StepDefinition
-      attr_reader :regexp_source, :location, :registry, :expression
+      attr_reader :id, :regexp_source, :location, :registry, :expression
 
       def initialize(connection, data, registry)
         @connection = connection

data/lib/cucumber/wire/version

@@ -1 +1 @@
-6.2.0
+6.2.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-wire
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Matt Wynne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-core
@@ -50,26 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 14.0.0
-- !ruby/object:Gem::Dependency
-  name: cucumber-messages
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '17.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 17.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '17.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 17.1.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -96,20 +76,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -203,10 +183,10 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-wire-6.2.0
+summary: cucumber-wire-6.2.1
 test_files:
+- spec/cucumber/wire/configuration_spec.rb
 - spec/cucumber/wire/connections_spec.rb
 - spec/cucumber/wire/connection_spec.rb
 - spec/cucumber/wire/data_packet_spec.rb
 - spec/cucumber/wire/exception_spec.rb
-- spec/cucumber/wire/configuration_spec.rb