Merge remote-tracking branch 'origin/refactor/update_cck_conformance' into refactor/update_cck_conformance

Author: luke-hill

compatibility/cck_spec.rb

@@ -24,7 +24,6 @@
 
   items_to_fix =
     %w[
-      global-hooks
       global-hooks-afterall-error
       global-hooks-attachments
       global-hooks-beforeall-error

lib/cucumber/events.rb

@@ -34,6 +34,8 @@ def self.registry
         TestCaseStarted,
         TestCaseReady,
         TestRunFinished,
+        TestRunHookFinished,
+        TestRunHookStarted,
         TestRunStarted,
         TestStepCreated,
         TestStepFinished,

lib/cucumber/events/test_run_hook_finished.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'cucumber/core/events'
+
+module Cucumber
+  module Events
+    class TestRunHookFinished < Core::Event.new(:hook, :test_result)
+      attr_reader :hook, :test_result
+    end
+  end
+end

lib/cucumber/events/test_run_hook_started.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'cucumber/core/events'
+
+module Cucumber
+  module Events
+    class TestRunHookStarted < Core::Event.new(:hook)
+      attr_reader :hook
+    end
+  end
+end

lib/cucumber/formatter/message_builder.rb

@@ -42,6 +42,8 @@ def initialize(config)
         config.on_event :test_case_started, &method(:on_test_case_started)
         config.on_event :test_run_finished, &method(:on_test_run_finished)
         config.on_event :test_run_started, &method(:on_test_run_started)
+        config.on_event :test_run_hook_started, &method(:on_test_run_hook_started)
+        config.on_event :test_run_hook_finished, &method(:on_test_run_hook_finished)
         # TODO: Handle TestStepCreated
         config.on_event :test_step_finished, &method(:on_test_step_finished)
         config.on_event :test_step_started, &method(:on_test_step_started)
@@ -296,6 +298,45 @@ def on_step_definition_registered(event)
         output_envelope(event.step_definition.to_envelope)
       end
 
+      def on_test_run_hook_started(event)
+        @current_test_run_hook_started_id = @config.id_generator.new_id
+
+        message = Cucumber::Messages::Envelope.new(
+          test_run_hook_started: Cucumber::Messages::TestRunHookStarted.new(
+            id: @current_test_run_hook_started_id,
+            hook_id: event.hook.id,
+            test_run_started_id: @test_run_started.id,
+            timestamp: time_to_timestamp(Time.now)
+          )
+        )
+
+        output_envelope(message)
+      end
+
+      def on_test_run_hook_finished(event)
+        result = event.test_result
+        result_message = result.to_message
+
+        if result.failed?
+          result_message = Cucumber::Messages::TestStepResult.new(
+            status: result_message.status,
+            duration: result_message.duration,
+            message: create_error_message(result.exception),
+            exception: create_exception_object(result, result.exception)
+          )
+        end
+
+        message = Cucumber::Messages::Envelope.new(
+          test_run_hook_finished: Cucumber::Messages::TestRunHookFinished.new(
+            test_run_hook_started_id: @current_test_run_hook_started_id,
+            timestamp: time_to_timestamp(Time.now),
+            result: result_message
+          )
+        )
+
+        output_envelope(message)
+      end
+
       def on_undefined_parameter_type(event)
         message = Cucumber::Messages::Envelope.new(
           undefined_parameter_type: Cucumber::Messages::UndefinedParameterType.new(

lib/cucumber/glue/registry_and_more.rb

@@ -148,13 +148,13 @@ def install_plugin(configuration, registry)
 
       def before_all
         hooks[:before_all].each do |hook|
-          hook.invoke('BeforeAll', [])
+          invoke_run_hook(hook, 'BeforeAll')
         end
       end
 
       def after_all
         hooks[:after_all].each do |hook|
-          hook.invoke('AfterAll', [])
+          invoke_run_hook(hook, 'AfterAll')
         end
       end
 
@@ -180,6 +180,18 @@ def create_expression(string_or_regexp)
 
       private
 
+      def invoke_run_hook(hook, pseudo_method)
+        @configuration.notify(:test_run_hook_started, hook)
+        timer = Core::Test::Timer.new.start
+        begin
+          hook.invoke(pseudo_method, [])
+          @configuration.notify(:test_run_hook_finished, hook, Core::Test::Result::Passed.new(timer.duration))
+        rescue StandardError => e
+          @configuration.notify(:test_run_hook_finished, hook, Core::Test::Result::Failed.new(timer.duration, e))
+          raise
+        end
+      end
+
       def parameter_type_envelope(parameter_type)
         # TODO: should this be moved to Cucumber::Expression::ParameterType#to_envelope ??
         # Note: that would mean that cucumber-expression would depend on cucumber-messages