cucumber 2.0.0.beta.1 → 2.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 514eb451f10f568e1402ba020ee3ee6256032dca
-  data.tar.gz: 1e21fe76f4e75993ef5effa867cddc1f0ef823ef
+  metadata.gz: ec39cd25b8f17917a20fd5af809119a9ecad0671
+  data.tar.gz: 43aced438654c8263f00185586f45c42daeedab0
 SHA512:
-  metadata.gz: f6a83f29f65355640bd4df83bd8bcac5b086445318c76cf3250e7ae2db1aacdfe4b6753546f983111014b1536f7944176e959c9783cba9baa8a3305a3c745947
-  data.tar.gz: 996994c7adba08dc88ca282cd1e7de86095940ae3780fc032b3a58d7c44635674802989f2aaaf13cf99a1d84837c1d3ee3d85fc8c77d964eb227acab0f54a130
+  metadata.gz: 8b7126a89b0f2e88fc81dfbd3aebf4998928f8f49033ba67a453a74525234b1d73f811aba9346bafe2c0274fbc6cc8b4deb45c5a0a4411e54cbf47c3e5ece726
+  data.tar.gz: 4c81bc4dd772677dc1888a4da72eaf8401093440274faac071beb52f9dc320e481e6b34735486aec2e3c3b914d9096e3b273591265e379082447efa0f288a9d1

data/History.md

@@ -1,4 +1,14 @@
-## [v2.0.0.pre (unreleased)](https://github.com/cucumber/cucumber/compare/v1.3.8...master)
+## [In Git](https://github.com/cucumber/cucumber/compare/v.2.0.0.beta.1...master)
+
+### Bugfixes
+
+  * Better reporting of exceptions in Before / After hooks ([723](https://github.com/cucumber/cucumber/pull/723) @mattwynne)
+
+### New features
+
+* Support embedding images directly in HTML and JSON reports ([696](https://github.com/cucumber/cucumber/pull/696),[695](https://github.com/cucumber/cucumber/pull/695/files) @brasmusson)
+
+## [v2.0.0.beta.1 ](https://github.com/cucumber/cucumber/compare/v1.3.8...v.2.0.0.beta.1)
 
 Version 2.0 contains a major internal redesign, extracting the core logic of
 parsing and executing tests into a [separate gem](https://github.com/cucumber/cucumber-ruby-core).
@@ -13,6 +23,7 @@ all.
 * Better snippet comment ([579](https://github.com/cucumber/cucumber/pull/579) Jeff Nyman)
 * Random scenario ordering with `--order random`
 * Embed plain text ([712](https://github.com/cucumber/cucumber/pull/712) @bingwei
+* Support the cucumber-reporting tools also when using Scenario Outlines ([700](https://github.com/cucumber/cucumber/pull/700) @brasmusson
 
 ### Features removed
 
@@ -20,6 +31,7 @@ all.
 * Remove support for i18n nested step methods (Matt Wynne)
 * Remove experimental .js and .py support (Matt Wynne)
 * Remove Ruby 1.8.7 support, including RCov
+* Spork support
 
 ### API Changes
 

data/cucumber.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = ">= 1.9.3"
 
-  s.add_dependency 'cucumber-core', '~> 1.0.0.beta.1'
+  s.add_dependency 'cucumber-core', '~> 1.0.0.beta.2'
   s.add_dependency 'builder', '>= 2.1.2'
   s.add_dependency 'diff-lcs', '>= 1.1.3'
   s.add_dependency 'gherkin', '~> 2.12'

data/features/docs/formatters/json_formatter.feature

@@ -27,6 +27,11 @@ Feature: JSON output formatter
       Given /^I print from step definition/ do
         puts "from step definition"
       end
+
+      Given /^I embed data directly/ do
+        data = "YWJj"
+        embed data, "mime-type;base64"
+      end
       """
     And a file named "features/embed.feature" with:
       """
@@ -70,6 +75,14 @@ Feature: JSON output formatter
           And I print from step definition
 
       """
+    And a file named "features/embed_data_directly.feature" with:
+      """
+      Feature: An embed data directly feature
+
+        Scenario:
+          Given I embed data directly
+
+      """
 
   # Need to investigate why this won't pass in-process. error_message doesn't get det?
   @spawn
@@ -586,3 +599,51 @@ Feature: JSON output formatter
     ]
 
     """
+
+  @spawn
+  Scenario: embedding data directly
+    When I run `cucumber -b --format json features/embed_data_directly.feature`
+    Then it should pass with JSON:
+    """
+    [
+      {
+        "uri": "features/embed_data_directly.feature",
+        "id": "an-embed-data-directly-feature",
+        "keyword": "Feature",
+        "name": "An embed data directly feature",
+        "line": 1,
+        "description": "",
+        "elements": [
+          {
+            "id": "an-embed-data-directly-feature;",
+            "keyword": "Scenario",
+            "name": "",
+            "line": 3,
+            "description": "",
+            "type": "scenario",
+            "steps": [
+              {
+                "keyword": "Given ",
+                "name": "I embed data directly",
+                "line": 4,
+                "embeddings": [
+                  {
+		    "mime_type": "mime-type",
+		    "data": "YWJj"
+                  }
+                ],
+                "match": {
+                  "location": "features/step_definitions/json_steps.rb:10"
+                },
+                "result": {
+                  "status": "passed",
+                  "duration": 1
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+
+    """

data/features/docs/report_called_undefined_steps.feature

@@ -2,56 +2,56 @@ Feature: Cucumber command line
   In order to find out what step definitions need to be implemented
   Developers should always see what step definition is missing
 
-  @wip-new-core
   @spawn
   Scenario: Get info at arbitrary levels of nesting
     Given a file named "features/call_undefined_step_from_step_def.feature" with:
       """
       Feature: Calling undefined step
 
+        Scenario: Call from feature
+          Given this directly called step does not exist
+
         Scenario: Call directly
-          Given a step definition that calls an undefined step
+          Given a step that calls an undefined step
 
         Scenario: Call via another
-          Given call step "a step definition that calls an undefined step"
+          Given a step that calls a step that calls an undefined step
       """
     And a file named "features/step_definitions/steps.rb" with:
       """
-      Given /^a step definition that calls an undefined step$/ do
+      Given /^a step that calls an undefined step$/ do
         step 'this does not exist'
       end
 
-      Given /^call step "(.*)"$/ do |step_name| x=1
-        step step_name
+      Given /^a step that calls a step that calls an undefined step$/ do
+        step 'a step that calls an undefined step'
       end
       """
-    When I run `cucumber features/call_undefined_step_from_step_def.feature`
-    Then it should pass with:
+    When I run `cucumber --strict -q features/call_undefined_step_from_step_def.feature`
+    Then it should fail with exactly:
       """
       Feature: Calling undefined step
 
-        Scenario: Call directly                                # features/call_undefined_step_from_step_def.feature:3
-          Given a step definition that calls an undefined step # features/step_definitions/steps.rb:1
-            Undefined step: "this does not exist" (Cucumber::Undefined)
-            ./features/step_definitions/steps.rb:2:in `/^a step definition that calls an undefined step$/'
-            features/call_undefined_step_from_step_def.feature:4:in `Given a step definition that calls an undefined step'
+        Scenario: Call from feature
+          Given this directly called step does not exist
+            Undefined step: "this directly called step does not exist" (Cucumber::Undefined)
+            features/call_undefined_step_from_step_def.feature:4:in `Given this directly called step does not exist'
 
-        Scenario: Call via another                                         # features/call_undefined_step_from_step_def.feature:6
-          Given call step "a step definition that calls an undefined step" # features/step_definitions/steps.rb:5
+        Scenario: Call directly
+          Given a step that calls an undefined step
             Undefined step: "this does not exist" (Cucumber::Undefined)
-            ./features/step_definitions/steps.rb:2:in `/^a step definition that calls an undefined step$/'
-            ./features/step_definitions/steps.rb:6:in `/^call step "(.*)"$/'
-            features/call_undefined_step_from_step_def.feature:7:in `Given call step "a step definition that calls an undefined step"'
+            ./features/step_definitions/steps.rb:2:in `/^a step that calls an undefined step$/'
+            features/call_undefined_step_from_step_def.feature:7:in `Given a step that calls an undefined step'
 
-      2 scenarios (2 undefined)
-      2 steps (2 undefined)
-      """
-    And the output should contain:
-      """
-      You can implement step definitions for undefined steps with these snippets:
+        Scenario: Call via another
+          Given a step that calls a step that calls an undefined step
+            Undefined step: "this does not exist" (Cucumber::Undefined)
+            ./features/step_definitions/steps.rb:2:in `/^a step that calls an undefined step$/'
+            ./features/step_definitions/steps.rb:6:in `/^a step that calls a step that calls an undefined step$/'
+            features/call_undefined_step_from_step_def.feature:10:in `Given a step that calls a step that calls an undefined step'
 
-      Given(/^this does not exist$/) do
-        pending # Write code here that turns the phrase above into concrete actions
-      end
+      3 scenarios (3 undefined)
+      3 steps (3 undefined)
+      0m0.012s
 
       """

data/lib/cucumber/ast.rb

@@ -0,0 +1,13 @@
+require 'cucumber/multiline_argument'
+
+module Cucumber
+  module Ast
+    def self.const_missing(const_name)
+      if const_name == :Table
+        warn "`Cucumber::Ast::Table` has been deprecated. Use `Cucumber::MultilineArgument::DataTable` instead."
+        return Cucumber::MultilineArgument::DataTable
+      end
+      raise "`Cucumber::Ast` no longer exists. These classes have moved into the `Cucumber::Core::Ast` namespace, but may not have the same API."
+    end
+  end
+end

data/lib/cucumber/errors.rb

@@ -2,20 +2,21 @@ require 'cucumber/core/test/result'
 
 module Cucumber
   # Raised when there is no matching StepDefinition for a step.
-  class Undefined < StandardError
-    attr_reader :step_name
+  class Undefined < Core::Test::Result::Undefined
+    def self.from(result, step_name)
+      if result.is_a?(self)
+        return result.with_message(with_prefix(result.message))
+      end
 
-    def initialize(step_name)
-      super %{Undefined step: "#{step_name}"}
-      @step_name = step_name
+      begin
+        raise self.new(with_prefix(step_name))
+      rescue => exception
+        return exception
+      end
     end
 
-    def nested!
-      @nested = true
-    end
-
-    def nested?
-      @nested
+    def self.with_prefix(step_name)
+      %(Undefined step: "#{step_name}")
     end
   end
 

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -146,15 +146,20 @@ module Cucumber
       end
 
       def embed(file, mime_type, label)
-        # Only embed if file exists
-        if File.exists?(file)
+        if File.file?(file)
           data = File.open(file, 'rb') { |f| f.read }
-
-          if defined?(JRUBY_VERSION)
-            data = data.to_java_bytes
+        else
+          if mime_type =~ /;base64$/
+            mime_type = mime_type[0..-8]
+            data = Base64.decode64(file)
+          else
+            data = file
           end
-          @gf.embedding(mime_type, data)
         end
+        if defined?(JRUBY_VERSION)
+          data = data.to_java_bytes
+        end
+        @gf.embedding(mime_type, data)
       end
 
       def puts(message)

data/lib/cucumber/formatter/html.rb

@@ -37,6 +37,10 @@ module Cucumber
       def embed(src, mime_type, label)
         case(mime_type)
         when /^image\/(png|gif|jpg|jpeg)/
+          unless File.file?(src) or src =~ /^data:image\/(png|gif|jpg|jpeg);base64,/
+            type = mime_type =~ /;base[0-9]+$/ ? mime_type : mime_type + ";base64"
+            src = "data:" + type + "," + src
+          end
           embed_image(src, label)
         when /^text\/plain/
           embed_text(src, label)

data/lib/cucumber/formatter/rerun.rb

@@ -25,6 +25,10 @@ module Cucumber
       def before_feature(feature_element)
         @lines = []
         @file = feature_element.file
+        # See https://github.com/cucumber/cucumber/issues/629
+        if @file.include?(' ')
+          warn("Filenames with spaces like '#{@file}' cause unexpected behaviour from the rerun formatter.")
+        end
       end
 
       def after_feature(*)

data/lib/cucumber/mappings.rb

@@ -84,7 +84,7 @@ module Cucumber
       end
     end
 
-    # adapts our test_case to look like the Cucumber Runtime's Scenario
+    # adapts our test_case to look like the Cucumber Runtime's old Scenario
     class TestCase
       def initialize(test_case, feature)
         @test_case = test_case
@@ -95,6 +95,10 @@ module Cucumber
         hook.tag_expressions.all? { |expression| @test_case.match_tags?(expression) }
       end
 
+      def failed?
+        warn("Calling failed? on a scenario is not currently supported in Cucumber 2.0. Please see https://github.com/cucumber/cucumber/issues/726")
+      end
+
       def language
         @test_case.language
       end
@@ -108,10 +112,14 @@ module Cucumber
       end
 
       def source_tags
-        warn('deprecated: call #tags instead')
+        #warn('deprecated: call #tags instead')
         tags
       end
 
+      def source_tag_names
+        tags.map &:name
+      end
+
       def tags
         @test_case.tags
       end

data/lib/cucumber/multiline_argument.rb

@@ -113,3 +113,4 @@ module Cucumber
   end
 end
 
+require 'cucumber/ast'

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
   unless defined?(Cucumber::VERSION)
-    VERSION       = '2.0.0.beta.1'
+    VERSION       = '2.0.0.beta.2'
     BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
     LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
     JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/rb_support/rb_world.rb

@@ -39,7 +39,7 @@ module Cucumber
         # TODO: this argument parsing should move up out of core
         location = Core::Ast::Location.new(*caller[0].split(':')[0..1])
         core_multiline_arg = Core::Ast::MultilineArgument.from(raw_multiline_arg, location)
-        @__cucumber_runtime.invoke(name, MultilineArgument.from(core_multiline_arg))
+        @__cucumber_runtime.invoke(name, MultilineArgument.from(core_multiline_arg), location)
       end
 
       # Run a snippet of Gherkin

data/lib/cucumber/reports/legacy_formatter.rb

@@ -34,21 +34,12 @@ module Cucumber
       extend Forwardable
 
       def_delegators :formatter,
-        :embed,
         :ask
-        :puts
 
-      def before_test_case(test_case)
-        printer.before_test_case(test_case)
-      end
-
-      def before_test_step(test_step)
-        printer.before_test_step(test_step)
-      end
-
-      def after_test_step(test_step, result)
-        printer.after_test_step(test_step, result)
-      end
+      def_delegators :printer,
+        :before_test_case,
+        :before_test_step,
+        :after_test_step
 
       def after_test_case(test_case, result)
         record_test_case_result(test_case, result)
@@ -168,9 +159,16 @@ module Cucumber
 
         require 'ostruct'
         class StepSource < OpenStruct
-
           def build_step_invocation(indent, runtime, messages, embeddings)
-            step_result.step_invocation(step_match(runtime), step, indent, background, runtime.configuration, messages, embeddings)
+            step_result.step_invocation(
+              step_match(runtime),
+              step,
+              indent,
+              background,
+              runtime.configuration,
+              messages,
+              embeddings
+            )
           end
 
           private
@@ -180,7 +178,6 @@ module Cucumber
           rescue Cucumber::Undefined
             NoStepMatch.new(step, step.name)
           end
-
         end
 
       end
@@ -207,7 +204,7 @@ module Cucumber
         attr_reader :current_test_step_source
 
         def before_test_case(test_case)
-          @before_hook_result = Legacy::Ast::Node.new
+          @before_hook_results = Legacy::Ast::NodeCollection.new
         end
 
         def before_test_step(test_step)
@@ -232,11 +229,14 @@ module Cucumber
         end
 
         def before_hook(location, result)
-          @before_hook_result = Legacy::Ast::BeforeHookResult.new(LegacyResultBuilder.new(result))
+          @before_hook_results << Legacy::Ast::HookResult.new(LegacyResultBuilder.new(result))
         end
 
         def after_hook(location, result)
-          @child.after_hook LegacyResultBuilder.new(result)
+          # if the scenario has no steps, we can hit this before we've created the scenario printer
+          # ideally we should call switch_step_container in before_step_step
+          switch_step_container if !@child 
+          @child.after_hook Legacy::Ast::HookResult.new(LegacyResultBuilder.new(result))
         end
 
         def after_step_hook(hook, result)
@@ -272,8 +272,8 @@ module Cucumber
 
         private
 
-        attr_reader :before_hook_result
-        private :before_hook_result
+        attr_reader :before_hook_results
+        private :before_hook_results
 
         def switch_step_container
           switch_to_child select_step_container(current_test_step_source), current_test_step_source
@@ -282,17 +282,17 @@ module Cucumber
         def select_step_container(source)
           if source.background
             if same_background_as_previous_test_case?(source)
-              HiddenBackgroundPrinter.new(formatter, runtime, source.background)
+              HiddenBackgroundPrinter.new(formatter, source.background)
             else
-              BackgroundPrinter.new(formatter, runtime, source.background, before_hook_result)
+              BackgroundPrinter.new(formatter, source.background, before_hook_results)
             end
           elsif source.scenario
-            ScenarioPrinter.new(formatter, runtime, source.scenario, before_hook_result)
+            ScenarioPrinter.new(formatter, source.scenario, before_hook_results)
           elsif source.scenario_outline
             if same_scenario_outline_as_previous_test_case?(source) and @previous_outline_child
               @previous_outline_child
             else
-              ScenarioOutlinePrinter.new(formatter, runtime, source.scenario_outline)
+              ScenarioOutlinePrinter.new(formatter, runtime.configuration, source.scenario_outline)
             end
           else
             raise 'unknown step container'
@@ -313,7 +313,7 @@ module Cucumber
 
           if current_test_step_source.scenario_outline
             @child.examples_table(current_test_step_source.examples_table)
-            @child.examples_table_row(current_test_step_source.examples_table_row, before_hook_result)
+            @child.examples_table_row(current_test_step_source.examples_table_row, before_hook_results)
           end
 
           if @failed_hidden_background_step
@@ -386,12 +386,33 @@ module Cucumber
 
       end
 
-      BackgroundPrinter = Struct.new(:formatter, :runtime, :node, :before_hook_result) do
+      module PrintsAfterHooks
+        def after_hook_results
+          @after_hook_results ||= Legacy::Ast::NodeCollection.new
+        end
+
+        def after_hook(result)
+          after_hook_results << result
+        end
+      end
+
+      # Basic printer used by default
+      class AfterHookPrinter
+        include Cucumber.initializer(:formatter)
+
+        include PrintsAfterHooks
+
+        def after
+          after_hook_results.accept(formatter)
+        end
+      end
+
+      BackgroundPrinter = Struct.new(:formatter, :node, :before_hook_results) do
 
         def before
           formatter.before_background node
           formatter.background_name node.keyword, node.legacy_conflated_name_and_description, node.location.to_s, indent.of(node)
-          before_hook_result.accept(formatter)
+          before_hook_results.accept(formatter)
           self
         end
 
@@ -400,7 +421,7 @@ module Cucumber
         end
 
         def step_invocation(step_invocation, source)
-          @child ||= StepsPrinter.new(formatter, runtime).before
+          @child ||= StepsPrinter.new(formatter).before
           @child.step_invocation step_invocation
           if source.step_result.status == :failed
             @failed = true
@@ -426,7 +447,7 @@ module Cucumber
 
       # Printer to handle background steps for anything but the first scenario in a
       # feature. These steps should not be printed.
-      class HiddenBackgroundPrinter < Struct.new(:formatter, :runtime, :node)
+      class HiddenBackgroundPrinter < Struct.new(:formatter, :node)
         def get_failed_step_source
           return @source_of_failed_step
         end
@@ -446,26 +467,23 @@ module Cucumber
         def after_test_case(*);end
       end
 
-      ScenarioPrinter = Struct.new(:formatter, :runtime, :node, :before_hook_result) do
+      ScenarioPrinter = Struct.new(:formatter, :node, :before_hook_results) do
+        include PrintsAfterHooks
 
         def before
           formatter.before_feature_element(node)
           Legacy::Ast::Tags.new(node.tags).accept(formatter)
           formatter.scenario_name node.keyword, node.legacy_conflated_name_and_description, node.location.to_s, indent.of(node)
-          before_hook_result.accept(formatter)
+          before_hook_results.accept(formatter)
           self
         end
 
         def step_invocation(step_invocation, source)
-          @child ||= StepsPrinter.new(formatter, runtime).before
+          @child ||= StepsPrinter.new(formatter).before
           @child.step_invocation step_invocation
           @last_step_result = source.step_result
         end
 
-        def after_hook(result)
-          @after_hook_result = result
-        end
-
         def after_step_hook(result)
           result.describe_exception_to formatter
         end
@@ -480,7 +498,7 @@ module Cucumber
           # TODO - the last step result might not accurately reflect the
           # overall scenario result.
           scenario = last_step_result.scenario(node.name, node.location)
-          @after_hook_result.describe_exception_to(formatter) if @after_hook_result
+          after_hook_results.accept(formatter)
           formatter.after_feature_element(scenario)
           @done = true
           self
@@ -497,7 +515,7 @@ module Cucumber
         end
       end
 
-      StepsPrinter = Struct.new(:formatter, :runtime) do
+      StepsPrinter = Struct.new(:formatter) do
         def before
           formatter.before_steps(nil)
           self
@@ -522,7 +540,7 @@ module Cucumber
 
       end
 
-      ScenarioOutlinePrinter = Struct.new(:formatter, :runtime, :node) do
+      ScenarioOutlinePrinter = Struct.new(:formatter, :configuration, :node) do
         extend Forwardable
         def_delegators :@child, :after_hook, :after_step_hook
 
@@ -530,14 +548,10 @@ module Cucumber
           formatter.before_feature_element(node)
           Legacy::Ast::Tags.new(node.tags).accept(formatter)
           formatter.scenario_name node.keyword, node.legacy_conflated_name_and_description, node.location.to_s, indent.of(node)
-          OutlineStepsPrinter.new(formatter, runtime, indent).print(node)
+          OutlineStepsPrinter.new(formatter, configuration, indent).print(node)
           self
         end
 
-        def after_hook(result)
-          @child.after_hook(result)
-        end
-
         def step_invocation(step_invocation, source)
           node, result = source.step, source.step_result
           @last_step_result = result
@@ -545,12 +559,12 @@ module Cucumber
         end
 
         def examples_table(examples_table)
-          @child ||= ExamplesArrayPrinter.new(formatter, runtime).before
+          @child ||= ExamplesArrayPrinter.new(formatter, configuration).before
           @child.examples_table(examples_table)
         end
 
-        def examples_table_row(node, before_hook_result)
-          @child.examples_table_row(node, before_hook_result)
+        def examples_table_row(node, before_hook_results)
+          @child.examples_table_row(node, before_hook_results)
         end
 
         def after_test_case
@@ -577,7 +591,7 @@ module Cucumber
         end
       end
 
-      OutlineStepsPrinter = Struct.new(:formatter, :runtime, :indent, :outline) do
+      OutlineStepsPrinter = Struct.new(:formatter, :configuration, :indent, :outline) do
         def print(node)
           node.describe_to self
           steps_printer.after
@@ -590,7 +604,7 @@ module Cucumber
         def outline_step(step)
           step_match = NoStepMatch.new(step, step.name)
           step_invocation = LegacyResultBuilder.new(Core::Test::Result::Skipped.new).
-            step_invocation(step_match, step, indent, background = nil, runtime.configuration, messages = [], embeddings = [])
+            step_invocation(step_match, step, indent, background = nil, configuration, messages = [], embeddings = [])
           steps_printer.step_invocation step_invocation
         end
 
@@ -603,7 +617,7 @@ module Cucumber
         end
       end
 
-      ExamplesArrayPrinter = Struct.new(:formatter, :runtime) do
+      ExamplesArrayPrinter = Struct.new(:formatter, :configuration) do
         extend Forwardable
         def_delegators :@child, :step_invocation, :after_hook, :after_step_hook, :after_test_case, :examples_table_row
 
@@ -615,7 +629,7 @@ module Cucumber
         def examples_table(examples_table)
           return if examples_table == @current
           @child.after if @child
-          @child = ExamplesTablePrinter.new(formatter, runtime, examples_table).before
+          @child = ExamplesTablePrinter.new(formatter, configuration, examples_table).before
           @current = examples_table
         end
 
@@ -626,7 +640,7 @@ module Cucumber
         end
       end
 
-      ExamplesTablePrinter = Struct.new(:formatter, :runtime, :node) do
+      ExamplesTablePrinter = Struct.new(:formatter, :configuration, :node) do
         extend Forwardable
         def_delegators :@child, :step_invocation, :after_hook, :after_step_hook, :after_test_case
 
@@ -634,20 +648,20 @@ module Cucumber
           formatter.before_examples(node)
           formatter.examples_name(node.keyword, node.legacy_conflated_name_and_description)
           formatter.before_outline_table(legacy_table)
-          if !runtime.configuration.expand?
-            HeaderTableRowPrinter.new(formatter, runtime, ExampleTableRow.new(node.header), Legacy::Ast::Node.new).before.after
+          if !configuration.expand?
+            HeaderTableRowPrinter.new(formatter, ExampleTableRow.new(node.header), Legacy::Ast::Node.new).before.after
           end
           self
         end
 
-        def examples_table_row(examples_table_row, before_hook_result)
+        def examples_table_row(examples_table_row, before_hook_results)
           return if examples_table_row == @current
           @child.after if @child
           row = ExampleTableRow.new(examples_table_row)
-          if !runtime.configuration.expand?
-            @child = TableRowPrinter.new(formatter, runtime, row, before_hook_result).before
+          if !configuration.expand?
+            @child = TableRowPrinter.new(formatter, row, before_hook_results).before
           else
-            @child = ExpandTableRowPrinter.new(formatter, runtime, row, before_hook_result).before
+            @child = ExpandTableRowPrinter.new(formatter, row, before_hook_results).before
           end
           @current = examples_table_row
         end
@@ -708,10 +722,8 @@ module Cucumber
         end
       end
 
-      class TableRowPrinterBase < Struct.new(:formatter, :runtime, :node, :before_hook_result)
-        def after_hook(result)
-          @after_hook_result = result
-        end
+      class TableRowPrinterBase < Struct.new(:formatter, :node, :before_hook_results)
+        include PrintsAfterHooks
 
         def after_step_hook(result)
           @after_step_hook_result = result
@@ -757,7 +769,7 @@ module Cucumber
 
       class TableRowPrinter < TableRowPrinterBase
         def before
-          before_hook_result.accept(formatter)
+          before_hook_results.accept(formatter)
           formatter.before_table_row(node)
           self
         end
@@ -780,7 +792,7 @@ module Cucumber
           end
           formatter.after_table_row(legacy_table_row)
           @after_step_hook_result.describe_exception_to formatter if @after_step_hook_result
-          @after_hook_result.describe_exception_to(formatter) if @after_hook_result
+          after_hook_results.accept(formatter)
           @done = true
           self
         end
@@ -794,7 +806,7 @@ module Cucumber
 
       class ExpandTableRowPrinter < TableRowPrinterBase
         def before
-          before_hook_result.accept(formatter)
+          before_hook_results.accept(formatter)
           self
         end
 
@@ -815,7 +827,7 @@ module Cucumber
           return if @done
           @child.after if @child
           @after_step_hook_result.describe_exception_to formatter if @after_step_hook_result
-          @after_hook_result.describe_exception_to(formatter) if @after_hook_result
+          after_hook_results.accept(formatter)
           @done = true
           self
         end
@@ -889,7 +901,8 @@ module Cucumber
       class LegacyResultBuilder
         attr_reader :status
         def initialize(result)
-          result.describe_to(self)
+          @result = result
+          @result.describe_to(self)
         end
 
         def passed
@@ -945,12 +958,8 @@ module Cucumber
         def step_exception(step, configuration)
           return filtered_step_exception(step) if @exception
           return nil unless @status == :undefined && configuration.strict?
-          begin
-            raise Cucumber::Undefined.new(step.name)
-          rescue => exception
-            @exception = exception
-            filtered_step_exception(step)
-          end
+          @exception = Cucumber::Undefined.from(@result, step.name)
+          filtered_step_exception(step)
         end
 
         def filtered_exception
@@ -1023,6 +1032,20 @@ module Cucumber
           private :node
         end
 
+        class NodeCollection
+          def initialize
+            @children = []
+          end
+
+          def accept(formatter)
+            @children.each { |child| child.accept(formatter) }
+          end
+
+          def <<(child)
+            @children << child
+          end
+        end
+
         Comments = Struct.new(:comments) do
           def accept(formatter)
             return if comments.empty?
@@ -1033,7 +1056,7 @@ module Cucumber
           end
         end
 
-        class BeforeHookResult
+        class HookResult
           def initialize(result)
             @result = result
             @already_accepted = false

data/lib/cucumber/runtime/support_code.rb

@@ -22,7 +22,7 @@ module Cucumber
         def step(step)
           location = Cucumber::Core::Ast::Location.new(*caller[0].split(':')[0..1])
           core_multiline_arg = Core::Ast::MultilineArgument.from(step.doc_string || step.rows, location)
-          @support_code.invoke(step.name, MultilineArgument.from(core_multiline_arg))
+          @support_code.invoke(step.name, MultilineArgument.from(core_multiline_arg), location)
         end
 
         def eof
@@ -55,15 +55,8 @@ module Cucumber
         parser.parse(steps_text, file, line.to_i)
       end
 
-      def invoke(step_name, multiline_argument)
-        file, line = *caller[2].split(':')[0..1]
-        location = Core::Ast::Location.new(file, line)
-        begin
-          step_match(step_name).invoke(multiline_argument)
-        rescue Exception => e
-          e.nested! if Undefined === e
-          raise e
-        end
+      def invoke(step_name, multiline_argument, location=nil)
+        step_match(step_name).invoke(multiline_argument)
       end
 
       # Loads and registers programming language implementation.
@@ -115,16 +108,6 @@ module Cucumber
         end
       end
 
-      def around(scenario, block)
-        @programming_languages.reverse.inject(block) do |blk, programming_language|
-          proc do
-            programming_language.around(scenario) do
-              blk.call(scenario)
-            end
-          end
-        end.call
-      end
-
       def step_definitions
         @programming_languages.map do |programming_language|
           programming_language.step_definitions

data/spec/cucumber/formatter/html_spec.rb

@@ -3,6 +3,7 @@ require 'cucumber/formatter/spec_helper'
 require 'cucumber/formatter/html'
 require 'nokogiri'
 require 'cucumber/rb_support/rb_language'
+require 'rspec/mocks'
 
 module Cucumber
   module Formatter
@@ -245,7 +246,10 @@ module Cucumber
 
         describe "with a step that embeds a snapshot" do
           define_steps do
-            Given(/snap/) { embed('snapshot.jpeg', 'image/jpeg') }
+            Given(/snap/) { 
+              RSpec::Mocks.allow_message(File, :file?) { true }
+              embed('snapshot.jpeg', 'image/jpeg')
+            }
           end
 
           define_feature(<<-FEATURE)
@@ -271,6 +275,34 @@ module Cucumber
           it { expect(@doc.at('a#text_0')['href'].to_s).to eq "log.txt" }
         end
 
+        describe "with a step that embeds a snapshot content manually" do
+          define_steps do
+            Given(/snap/) { embed('data:image/png;base64,YWJj', 'image/png') }
+          end
+
+          define_feature(<<-FEATURE)
+          Feature:
+            Scenario:
+              Given snap
+            FEATURE
+
+          it { expect(@doc.css('.embed img').first.attributes['src'].to_s).to eq "data:image/png;base64,YWJj" }
+        end
+
+        describe "with a step that embeds a snapshot content" do
+          define_steps do
+            Given(/snap/) { embed('YWJj', 'image/png;base64') }
+          end
+
+          define_feature(<<-FEATURE)
+          Feature:
+            Scenario:
+              Given snap
+            FEATURE
+
+          it { expect(@doc.css('.embed img').first.attributes['src'].to_s).to eq "data:image/png;base64,YWJj" }
+        end
+
         describe "with an undefined Given step then an undefined And step" do
           define_feature(<<-FEATURE)
           Feature:

data/spec/cucumber/mappings_spec.rb

@@ -0,0 +1,51 @@
+require_relative "../../lib/cucumber/mappings"
+require 'cucumber/core'
+require 'cucumber/core/gherkin/writer'
+
+module Cucumber
+  class Mappings
+    describe Scenario do
+      include Core::Gherkin::Writer
+      include Core
+      let(:ruby)      { double.as_null_object }
+      let(:runtime)   do
+        double(
+          load_programming_language: ruby, 
+          step_match: double
+        )
+      end
+      let(:mappings)  { Mappings.new(runtime) }
+      let(:report)    { double.as_null_object }
+
+      it "responds to #source_tag_names" do
+        gherkin_docs = [
+          gherkin do
+            feature 'test', tags: '@foo @bar' do
+              scenario 'test', tags: '@baz' do
+                step 'passing'
+              end
+            end
+          end
+        ]
+
+        # TODO: the complexity of this stubbing shows we need to clean up the interface
+        scenario_spy = nil
+        allow(ruby).to receive(:hooks_for) do |phase, scenario|
+          if phase == :before
+            hook = double
+            expect(hook).to receive(:invoke) do |phase, scenario|
+              scenario_spy = scenario
+            end
+            [hook]
+          else
+            []
+          end
+        end
+
+        execute gherkin_docs, mappings, report
+
+        expect(scenario_spy.source_tag_names).to eq %w(@foo @bar @baz)
+      end
+    end
+  end
+end

data/spec/cucumber/rb_support/rb_step_definition_spec.rb

@@ -89,7 +89,7 @@ module Cucumber
 
         expect(-> {
           run_step "Outside"
-        }).to raise_error(Cucumber::Undefined, 'Undefined step: "Inside"')
+        }).to raise_error(Cucumber::Undefined)
       end
 
       it "allows forced pending" do

data/spec/cucumber/reports/legacy_formatter_spec.rb

@@ -1439,7 +1439,7 @@ module Cucumber
         end
       end
 
-      context 'with exception in before hooks' do
+      context 'with exception in a single before hook' do
         it 'prints the exception after the scenario name' do
           define_steps do
             Before do
@@ -1590,6 +1590,47 @@ module Cucumber
         end
       end
 
+      context 'with exception in the first of several before hooks' do
+        # This proves that the second before hook's result doesn't overwrite
+        # the result of the first one.
+        it 'prints the exception after the scenario name' do
+          define_steps do
+            Before { raise 'an exception' }
+            Before { }
+          end
+          execute_gherkin do
+            feature do
+              scenario do
+                step 'passing'
+              end
+            end
+          end
+
+          expect( formatter.messages ).to eq([
+          :before_features,
+            :before_feature,
+              :before_tags,
+              :after_tags,
+              :feature_name,
+              :before_feature_element,
+                :before_tags,
+                :after_tags,
+                :scenario_name,
+                :exception,
+                :before_steps,
+                  :before_step,
+                    :before_step_result,
+                    :step_name,
+                    :after_step_result,
+                  :after_step,
+                :after_steps,
+              :after_feature_element,
+            :after_feature,
+          :after_features
+          ])
+        end
+      end
+
       context 'with exception in after hooks' do
         it 'prints the exception after the steps' do
           define_steps do
@@ -1688,6 +1729,75 @@ module Cucumber
           ])
         end
       end
+
+      context 'with exception in the first of several after hooks' do
+        it 'prints the exception after the steps' do
+          define_steps do
+            After { raise 'an exception' }
+            After { }
+          end
+          execute_gherkin do
+            feature do
+              scenario do
+                step 'passing'
+              end
+            end
+          end
+
+          expect( formatter.messages ).to eq([
+            :before_features,
+              :before_feature,
+                :before_tags,
+                :after_tags,
+                :feature_name,
+                :before_feature_element,
+                  :before_tags,
+                  :after_tags,
+                  :scenario_name,
+                  :before_steps,
+                    :before_step,
+                      :before_step_result,
+                      :step_name,
+                      :after_step_result,
+                    :after_step,
+                  :after_steps,
+                  :exception,
+                :after_feature_element,
+              :after_feature,
+            :after_features
+          ])
+        end
+      end
+
+      context 'with an exception in an after hook but no steps' do
+        it 'prints the exception after the steps' do
+          define_steps do
+            After { fail }
+          end
+          execute_gherkin do
+            feature do
+              scenario do
+              end
+            end
+          end
+
+          expect( formatter.messages ).to eq([
+            :before_features,
+              :before_feature,
+                :before_tags,
+                :after_tags,
+                :feature_name,
+                :before_feature_element,
+                  :before_tags,
+                  :after_tags,
+                  :scenario_name,
+                  :exception,
+                :after_feature_element,
+              :after_feature,
+            :after_features
+          ])
+        end
+      end
     end
 
     it 'passes an object responding to failed? with the after_feature_element message' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -647,6 +647,7 @@ files:
 - lib/autotest/cucumber_rspec2.rb
 - lib/autotest/discover.rb
 - lib/cucumber.rb
+- lib/cucumber/ast.rb
 - lib/cucumber/cli/configuration.rb
 - lib/cucumber/cli/main.rb
 - lib/cucumber/cli/options.rb
@@ -741,6 +742,7 @@ files:
 - spec/cucumber/formatter/pretty_spec.rb
 - spec/cucumber/formatter/progress_spec.rb
 - spec/cucumber/formatter/spec_helper.rb
+- spec/cucumber/mappings_spec.rb
 - spec/cucumber/rake/forked_spec.rb
 - spec/cucumber/rb_support/rb_language_spec.rb
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
@@ -787,10 +789,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: cucumber-2.0.0.beta.1
+summary: cucumber-2.0.0.beta.2
 test_files:
 - features/docs/api/list_step_defs_as_json.feature
 - features/docs/api/run_cli_main_with_existing_runtime.feature
@@ -886,6 +888,7 @@ test_files:
 - spec/cucumber/formatter/pretty_spec.rb
 - spec/cucumber/formatter/progress_spec.rb
 - spec/cucumber/formatter/spec_helper.rb
+- spec/cucumber/mappings_spec.rb
 - spec/cucumber/rake/forked_spec.rb
 - spec/cucumber/rb_support/rb_language_spec.rb
 - spec/cucumber/rb_support/rb_step_definition_spec.rb