cucumber 2.0.0.beta.2 → 2.0.0.beta.3

data/lib/cucumber/cli/configuration.rb

@@ -62,10 +62,6 @@ module Cucumber
         @options[:expand]
       end
 
-      def dotcucumber
-        @options[:dotcucumber]
-      end
-
       def snippet_type
         @options[:snippet_type] || :regexp
       end

data/lib/cucumber/cli/main.rb

@@ -36,7 +36,6 @@ module Cucumber
         end
 
         runtime.run!
-        runtime.write_stepdefs_json
         failure = runtime.results.failure? || Cucumber.wants_to_quit
         @kernel.exit(failure ? 1 : 0)
       rescue FileNotFoundException => e

data/lib/cucumber/cli/options.rb

@@ -223,9 +223,6 @@ module Cucumber
           opts.on("-x", "--expand", "Expand Scenario Outline Tables in output.") do
             @options[:expand] = true
           end
-          opts.on("--dotcucumber DIR", "Write metadata to DIR") do |dir|
-            @options[:dotcucumber] = dir
-          end
           opts.on("--order TYPE[:SEED]", "Run examples in the specified order. Available types:",
             *<<-TEXT.split("\n")) do |order|
   [defined]     Run scenarios in the order they were defined (default).

data/lib/cucumber/formatter/console.rb

@@ -139,7 +139,9 @@ module Cucumber
 
         unknown_programming_language = runtime.unknown_programming_language?
         snippets = undefined.map do |step|
-          step_name = Undefined === step.exception ? step.exception.step_name : step.name
+          # step_name = Undefined === step.exception ? step.exception.step_name : step.name
+          # TODO: This probably won't work for nested steps :( See above for old code. 
+          step_name = step.name
           @runtime.snippet_text(step.actual_keyword, step_name, step.multiline_arg)
         end.compact.uniq
 

data/lib/cucumber/formatter/debug.rb

@@ -24,6 +24,10 @@ module Cucumber
         @indent += 2 if name.to_s =~ /^before/
       end
 
+      def puts(*args)
+        print("puts")
+      end
+
     private
 
       def print(text)

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -10,6 +10,8 @@ module Cucumber
         @gf = gherkin_formatter
         @print_empty_match = print_empty_match
         @options = options
+        @delayed_messages = []
+        @delayed_embeddings = []
       end
 
       def before_feature(feature)
@@ -19,10 +21,12 @@ module Cucumber
 
       def before_background(background)
         @outline = false
+        @before_steps = true
         @gf.background(background.gherkin_statement)
       end
 
       def before_feature_element(feature_element)
+        @before_steps = true
         case(feature_element)
         when Core::Ast::Scenario
           @outline = false
@@ -65,6 +69,8 @@ module Cucumber
       def before_step(step)
         unless @outline and @options[:expand]
           @gf.step(step.gherkin_statement)
+          pass_delayed_output
+          @before_steps = false
         else 
           if @in_instantiated_scenario
             @current_step_hash = to_hash(step.gherkin_statement)
@@ -111,9 +117,11 @@ module Cucumber
               @current_step_hash['comments'],
               @current_step_hash['keyword'],
               step_match.format_args(),
-              @current_step_hash['line'],
+              file_colon_line.split(':')[1].to_i,
               @current_step_hash['rows'],
               @current_step_hash['doc_string']))
+          pass_delayed_output
+          @before_steps = false
           @gf.match(@current_match)
           @gf.result(@current_result)
         end
@@ -159,11 +167,19 @@ module Cucumber
         if defined?(JRUBY_VERSION)
           data = data.to_java_bytes
         end
-        @gf.embedding(mime_type, data)
+        unless @before_steps
+          @gf.embedding(mime_type, data)
+        else
+          @delayed_embeddings.push [mime_type, data]
+        end
       end
 
       def puts(message)
-        @gf.write(message)
+        unless @before_steps
+          @gf.write(message)
+        else
+          @delayed_messages.push message
+        end
       end
 
       private
@@ -175,6 +191,13 @@ module Cucumber
           gherkin_statement.to_hash
         end
       end
+
+      def pass_delayed_output
+        @delayed_messages.each { |message| @gf.write(message) }
+        @delayed_embeddings.each { |embed_data| @gf.embedding(embed_data[0], embed_data[1]) }
+        @delayed_messages = []
+        @delayed_embeddings = []
+      end
     end
   end
 end

data/lib/cucumber/formatter/html.rb

@@ -12,7 +12,7 @@ module Cucumber
         Cucumber::Core::Ast::Scenario        => 'scenario',
         Cucumber::Core::Ast::ScenarioOutline => 'scenario outline'
       }
-      AST_DATA_TABLE = Cucumber::Core::Ast::DataTable
+      AST_DATA_TABLE = Cucumber::Reports::Legacy::Ast::MultilineArg::DataTable
 
       include ERB::Util # for the #h method
       include Duration
@@ -618,8 +618,12 @@ module Cucumber
 
         def lines_around(file, line)
           if File.file?(file)
+            begin
             lines = File.open(file).read.split("\n")
-            min = [0, line-3].max
+          rescue ArgumentError
+            return "# Couldn't get snippet for #{file}"
+          end
+          min = [0, line-3].max
             max = [line+1, lines.length-1].min
             selected_lines = []
             selected_lines.join("\n")

data/lib/cucumber/formatter/usage.rb

@@ -21,36 +21,6 @@ module Cucumber
         print_profile_information
       end
 
-      def before_background(background)
-        @outline = false
-      end
-
-      def before_feature_element(feature_element)
-        case(feature_element)
-        when Core::Ast::Scenario
-          @outline = false
-        when Core::Ast::ScenarioOutline
-          @outline = true
-          if @options[:expand]
-            @in_instantiated_scenario = false
-          end
-        else
-          raise "Bad type: #{feature_element.class}"
-        end
-      end
-
-      def scenario_name(keyword, name, file_colon_line, source_indent)
-        if @outline and @in_instantiated_scenario
-          if @new_example_table
-            @example_row = 1
-            @new_example_table = false
-          else
-            @example_row += 1
-          end
-          @example_line = @current_example_rows[@example_row].to_hash['line']
-        end
-      end
-
       def before_step(step)
         @step = step
         @start_time = Time.now
@@ -65,30 +35,17 @@ module Cucumber
         unless step_definition.nil? # nil if it's from a scenario outline
           stepdef_key = StepDefKey.new(step_definition.regexp_source, step_definition.file_colon_line)
 
-          file_colon_line = @step.file_colon_line
-          if @outline and @in_instantiated_scenario
-            file_colon_line = replace_line_number(@step.file_colon_line, @example_line)
-          end
-
           @stepdef_to_match[stepdef_key] << {
             :keyword => keyword,
             :step_match => step_match,
             :status => status,
-            :file_colon_line => file_colon_line,
+            :file_colon_line => @step.file_colon_line,
             :duration => @duration
           }
         end
         super
       end
 
-      def before_examples(examples)
-        if @options[:expand]
-          @in_instantiated_scenario = true
-          @new_example_table = true
-          @current_example_rows = to_hash(examples.gherkin_statement)['rows']
-        end
-      end
-
       def print_summary(features)
         add_unused_stepdefs
         aggregate_info
@@ -176,20 +133,6 @@ module Cucumber
           @stepdef_to_match[stepdef_key] = []
         end
       end
-
-      private
-
-      def replace_line_number(file_colon_line, line)
-        file_colon_line.split(':')[0] + ':' + line.to_s
-      end
-
-      def to_hash(gherkin_statement)
-        if defined?(JRUBY_VERSION)
-          gherkin_statement.toMap()
-        else
-          gherkin_statement.to_hash
-        end
-      end
     end
   end
 end

data/lib/cucumber/mappings.rb

@@ -68,13 +68,13 @@ module Cucumber
 
     def map_test_case_hooks(mapper)
       ruby.hooks_for(:before, scenario).each do |hook|
-        mapper.before do
-          hook.invoke('Before', scenario)
+        mapper.before do |result|
+          hook.invoke('Before', scenario.with_result(result))
         end
       end
       ruby.hooks_for(:after, scenario).each do |hook|
-        mapper.after do
-          hook.invoke('After', scenario)
+        mapper.after do |result|
+          hook.invoke('After', scenario.with_result(result))
         end
       end
       ruby.hooks_for(:around, scenario).each do |hook|
@@ -86,9 +86,10 @@ module Cucumber
 
     # adapts our test_case to look like the Cucumber Runtime's old Scenario
     class TestCase
-      def initialize(test_case, feature)
+      def initialize(test_case, feature, result = Core::Test::Result::Unknown.new)
         @test_case = test_case
         @feature = feature
+        @result = result
       end
 
       def accept_hook?(hook)
@@ -96,7 +97,7 @@ module Cucumber
       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")
+        @result.failed?
       end
 
       def language
@@ -111,6 +112,11 @@ module Cucumber
         @test_case.name
       end
 
+      def title
+        warn("deprecated: call #name instead")
+        name
+      end
+
       def source_tags
         #warn('deprecated: call #tags instead')
         tags
@@ -123,12 +129,24 @@ module Cucumber
       def tags
         @test_case.tags
       end
+
+      def outline?
+        false
+      end
+
+      def with_result(result)
+        self.class.new(@test_case, @feature, result)
+      end
     end
 
     class Scenario < TestCase
     end
 
     class ScenarioOutlineExample < TestCase
+      def outline?
+        true
+      end
+
       def scenario_outline
         self
       end
@@ -204,7 +222,7 @@ module Cucumber
 
       private
       def map_step(node, step_match)
-        multiline_arg = MultilineArgument.from(node.multiline_arg)
+        multiline_arg = MultilineArgument.from_core(node.multiline_arg)
         mapper.map { step_match.invoke(multiline_arg) }
       end
 

data/lib/cucumber/multiline_argument.rb

@@ -1,104 +1,62 @@
 require 'delegate'
+require 'cucumber/multiline_argument/data_table'
+require 'cucumber/multiline_argument/doc_string'
+require 'gherkin/rubify'
+
 module Cucumber
   module MultilineArgument
-    def self.from(core_multiline_arg)
-      Builder.new(core_multiline_arg).result
-    end
-
-    class Builder
-      def initialize(multiline_arg)
-        multiline_arg.describe_to self
-      end
+    extend Gherkin::Rubify
 
-      def doc_string(string, *args)
-        @result = DocString.new(string)
+    class << self
+      def from_core(node)
+        builder.wrap(node)
       end
 
-      def data_table(table, *args)
-        @result = DataTable.new(table)
+      def from(argument, location=nil)
+        location ||= Core::Ast::Location.of_caller
+        argument = rubify(argument)
+        case argument
+        when String
+          doc_string(argument, 'text/plain', location)
+        when Array
+          location = location.on_line(argument.first.line..argument.last.line)
+          data_table(argument.map{ |row| row.cells }, location)
+        when DataTable, DocString, None
+          argument
+        when nil
+          None.new
+        else
+          raise ArgumentError, "Don't know how to convert #{argument.class} #{argument.inspect} into a MultilineArgument"
+        end
       end
 
-      def result
-        @result || None.new
+      def doc_string(argument, content_type, location)
+        builder.doc_string(Core::Ast::DocString.new(argument, content_type, location))
       end
-    end
 
-    class DocString < SimpleDelegator
-      def append_to(array)
-        array << self
+      def data_table(data, location)
+        builder.data_table(Core::Ast::DataTable.new(data, location))
       end
-    end
 
-    class DataTable < SimpleDelegator
-      def append_to(array)
-        array << self
-      end
+      private
 
-      def to_json(options)
-        raw.to_json(options)
+      def builder
+        @builder ||= Builder.new
       end
 
-      def diff!(other_table)
-        other_table = ensure_table(other_table)
-        other_table_cell_matrix = other_table.cell_matrix
-
-        ensure_green!
-
-        require_diff_lcs
-        cell_matrix.extend(Diff::LCS)
-
-        changes = cell_matrix.diff(other_table_cell_matrix).flatten
-
-        return if changes.empty?
-
-        inserted = 0
-        missing  = 0
-
-        changes.each do |change|
-          if(change.action == '-')
-            missing_row_pos = change.position + inserted
-            cell_matrix[missing_row_pos].each{|cell| cell.status = :undefined}
-
-            missing += 1
-          else # '+'
-            inserted_row = change.element
-            inserted_row.each{|cell| cell.status = :comment}
-
-            insert_row_pos = change.position + missing
-            cell_matrix.insert(insert_row_pos, inserted_row)
-
-            inserted += 1
-          end
+      class Builder
+        def wrap(node)
+          @result = None.new
+          node.describe_to(self)
+          @result
         end
 
-        raise Different.new(self)
-      end
-
-      def ensure_green! #:nodoc:
-        each_cell{|cell| cell.status = :passed}
-      end
-
-      private
-
-      def ensure_table(table_or_array) #:nodoc:
-        return table_or_array if DataTable === table_or_array
-        DataTable.new(table_or_array)
-      end
-
-      def require_diff_lcs #:nodoc:
-        begin
-          require 'diff/lcs'
-        rescue LoadError => e
-          e.message << "\n Please gem install diff-lcs\n"
-          raise e
+        def doc_string(node, *args)
+          @result = DocString.new(node)
         end
-      end
 
-      class Different < StandardError
-        attr_reader :table
-        def initialize(table)
-          @table = table
-          super("Tables were not identical")
+        def data_table(node, *args)
+          @result = DataTable.new(node)
         end
       end
     end