Merge e5b4a21 into 5d41017

lib/cucumber/core/events.rb

@@ -5,6 +5,10 @@ module Cucumber
   module Core
     module Events
 
+      class Envelope < Event.new(:envelope)
+        attr_reader :envelope
+      end
+
       # Signals that a gherkin source has been parsed
       class GherkinSourceParsed < Event.new(:gherkin_document)
         # @return [GherkinDocument] the GherkinDocument Ast Node
@@ -55,6 +59,7 @@ class TestCaseFinished < Event.new(:test_case, :result)
       # that will be used by the {EventBus} by default.
       def self.registry
         build_registry(
+          Envelope,
           GherkinSourceParsed,
           TestCaseStarted,
           TestStepStarted,

lib/cucumber/core/gherkin/parser.rb

@@ -19,6 +19,7 @@ def initialize(receiver, event_bus, gherkin_query)
         def document(document)
           messages = ::Gherkin.from_source(document.uri, document.body, gherkin_options(document))
           messages.each do |message|
+            event_bus.envelope(message)
             gherkin_query.update(message)
             if !message.gherkin_document.nil?
               event_bus.gherkin_source_parsed(message.gherkin_document)

spec/cucumber/core/gherkin/parser_spec.rb

@@ -15,6 +15,7 @@ module Gherkin
 
         before do
           allow( event_bus ).to receive(:gherkin_source_parsed)
+          allow( event_bus).to receive(:envelope)
           allow( gherkin_query ).to receive(:update)
         end
 
@@ -42,6 +43,12 @@ def parse
             expect( event_bus ).to receive(:gherkin_source_parsed)
             parse
           end
+
+          it "emits an 'envelope' event for every message produced by Gherkin" do
+            # Only one message emited, there's no pickles generated
+            expect( event_bus ).to receive(:envelope).once
+            parse
+          end
         end
 
         context "for empty files" do
@@ -89,6 +96,13 @@ def self.source(&block)
             expect( receiver ).to receive(:pickle)
             parse
           end
+
+          it "emits an 'envelope' event containing the pickle" do
+            allow( receiver ).to receive(:pickle)
+            # Once for the gherkin document, once with the pickle
+            expect( event_bus ).to receive(:envelope).twice
+            parse
+          end
         end
 
         context "when scenario is inside a rule" do