cucumber 1.3.20 → 2.0.0.beta.1

data/lib/cucumber/core_ext/instance_exec.rb

@@ -8,35 +8,12 @@ module Cucumber
 end
 
 class Object #:nodoc:
-  unless defined? instance_exec # 1.9
-    # http://eigenclass.org/hiki/bounded+space+instance_exec
-    module InstanceExecHelper #:nodoc:
-    end
-    include InstanceExecHelper
-    def instance_exec(*args, &block)
-      begin
-        old_critical, Thread.critical = Thread.critical, true
-        n = 0
-        n += 1 while respond_to?(mname="__instance_exec#{n}")
-        InstanceExecHelper.module_eval{ define_method(mname, &block) }
-      ensure
-        Thread.critical = old_critical
-      end
-      begin
-        ret = send(mname, *args)
-      ensure
-        InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
-      end
-      ret
-    end
-  end
-
   # TODO: Move most of this stuff out to an InstanceExecutor class.
   def cucumber_instance_exec(check_arity, pseudo_method, *args, &block)
     cucumber_run_with_backtrace_filtering(pseudo_method) do
       if check_arity && !cucumber_compatible_arity?(args, block)
         instance_exec do
-          ari = cucumber_arity(block)
+          ari = block.arity
           ari = ari < 0 ? (ari.abs-1).to_s+"+" : ari
           s1 = ari == 1 ? "" : "s"
           s2 = args.length == 1 ? "" : "s"
@@ -52,15 +29,11 @@ class Object #:nodoc:
 
   private
 
-  def cucumber_arity(block)
-    a = block.arity
-    Cucumber::RUBY_1_8_7 ? (a == -1 ? 0 : a) : a
-  end
-
   def cucumber_compatible_arity?(args, block)
-    ari = cucumber_arity(block)
-    len = args.length
-    return true if ari == len or ari < 0 && len >= ari.abs-1
+    return true if block.arity == args.length
+    if block.arity < 0
+      return true if args.length >= (block.arity.abs - 1)
+    end
     false
   end
 
@@ -74,7 +47,7 @@ class Object #:nodoc:
     end
   end
 
-  INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_2_2 || Cucumber::RUBY_2_1 || Cucumber::RUBY_2_0 || Cucumber::RUBY_1_9 || Cucumber::RUBY_1_8_7 || Cucumber::JRUBY) ? -3 : -4
+  INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_2_1 || Cucumber::RUBY_2_0 || Cucumber::RUBY_1_9 || Cucumber::JRUBY) ? -3 : -4
 
   def replace_instance_exec_invocation_line!(backtrace, instance_exec_invocation_line, pseudo_method)
     return if Cucumber.use_full_backtrace
@@ -82,11 +55,7 @@ class Object #:nodoc:
     instance_exec_pos = backtrace.index(instance_exec_invocation_line)
     if instance_exec_pos
       replacement_line = instance_exec_pos + INSTANCE_EXEC_OFFSET
-      if Cucumber::RUBY_1_8_7
-        backtrace[replacement_line] += ":in `#{pseudo_method}'" if pseudo_method
-      else
-        backtrace[replacement_line].gsub!(/`.*'/, "`#{pseudo_method}'") if pseudo_method
-      end
+      backtrace[replacement_line].gsub!(/`.*'/, "`#{pseudo_method}'") if pseudo_method
 
       depth = backtrace.count { |line| line == instance_exec_invocation_line }
       end_pos = depth > 1 ? instance_exec_pos : -1

data/lib/cucumber/core_ext/proc.rb

@@ -17,7 +17,7 @@ class Proc #:nodoc:
       path, line = *to_s.match(PROC_PATTERN)[1..2]
       path = File.expand_path(path)
       pwd = File.expand_path(PWD)
-      pwd.force_encoding(path.encoding) unless Cucumber::RUBY_1_8_7
+      pwd.force_encoding(path.encoding)
       if path.index(pwd)
         path = path[pwd.length+1..-1]
       elsif path =~ /.*\/gems\/(.*\.rb)$/

data/lib/cucumber/errors.rb

@@ -1,3 +1,5 @@
+require 'cucumber/core/test/result'
+
 module Cucumber
   # Raised when there is no matching StepDefinition for a step.
   class Undefined < StandardError
@@ -18,7 +20,7 @@ module Cucumber
   end
 
   # Raised when a StepDefinition's block invokes World#pending
-  class Pending < StandardError
+  class Pending < Core::Test::Result::Pending
   end
 
   # Raised when a step matches 2 or more StepDefinitions

data/lib/cucumber/file_specs.rb

@@ -0,0 +1,35 @@
+require 'cucumber/core/ast/location'
+module Cucumber
+  class FileSpecs
+    FILE_COLON_LINE_PATTERN = /^([\w\W]*?)(?::([\d:]+))?$/ #:nodoc:
+
+    def initialize(file_specs)
+      Cucumber.logger.debug("Features:\n")
+      @file_specs = file_specs.map { |s| FileSpec.new(s) }
+      Cucumber.logger.debug("\n")
+    end
+
+    def locations
+      @file_specs.map(&:locations).flatten
+    end
+
+    def files
+      @file_specs.map(&:file)
+    end
+
+    class FileSpec
+      def initialize(s)
+        @file, @lines = *FILE_COLON_LINE_PATTERN.match(s).captures
+        Cucumber.logger.debug("  * #{@file}\n")
+        @lines = String(@lines).split(':').map { |line| Integer(line) }
+      end
+
+      attr_reader :file
+
+      def locations
+        return [ Core::Ast::Location.new(@file) ] if @lines.empty?
+        @lines.map { |line| Core::Ast::Location.new(@file, line) }
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/console.rb

@@ -32,7 +32,7 @@ module Cucumber
 
       def format_step(keyword, step_match, status, source_indent)
         comment = if source_indent
-          c = (' # ' + step_match.file_colon_line).indent(source_indent)
+          c = ('# ' + step_match.file_colon_line).indent(source_indent)
           format_string(c, :comment)
         else
           ''
@@ -77,17 +77,9 @@ module Cucumber
       end
 
       def print_stats(features, options)
-        @failures = runtime.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) || s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow) }
-        @failures.collect! { |s| (s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow)) ? s.scenario_outline : s }
-
-        if !@failures.empty?
-          @io.puts format_string("Failing Scenarios:", :failed)
-          @failures.each do |failure|
-            profiles_string = options.custom_profiles.empty? ? '' : (options.custom_profiles.map{|profile| "-p #{profile}" }).join(' ') + ' '
-            source = options[:source] ? format_string(" # Scenario: " + failure.name, :comment) : ''
-            @io.puts format_string("cucumber #{profiles_string}" + failure.file_colon_line, :failed) + source
-          end
-          @io.puts
+        failures = collect_failing_scenarios(runtime)
+        if !failures.empty?
+          print_failing_scenarios(failures, options.custom_profiles, options[:source])
         end
 
         @io.puts scenario_summary(runtime) {|status_count, status| format_string(status_count, status)}
@@ -95,9 +87,36 @@ module Cucumber
 
         @io.puts(format_duration(features.duration)) if features && features.duration
 
+        if runtime.configuration.randomize?
+          @io.puts
+          @io.puts "Randomized with seed #{runtime.configuration.seed}"
+        end
+
         @io.flush
       end
 
+      def collect_failing_scenarios(runtime)
+        # TODO: brittle - stop coupling to types
+        scenario_class = Cucumber::Reports::Legacy::Ast::Scenario
+        example_table_class = Cucumber::Core::Ast::ExamplesTable
+
+        runtime.scenarios(:failed).select do |s|
+          [scenario_class, example_table_class].include?(s.class)
+        end.map do |s|
+          s.is_a?(example_table_class)? s.scenario_outline : s
+        end
+      end
+
+      def print_failing_scenarios(failures, custom_profiles, given_source)
+        @io.puts format_string("Failing Scenarios:", :failed)
+        failures.each do |failure|
+          profiles_string = custom_profiles.empty? ? '' : (custom_profiles.map{|profile| "-p #{profile}" }).join(' ') + ' '
+          source = given_source ? format_string(" # " + failure.name, :comment) : ''
+          @io.puts format_string("cucumber #{profiles_string}" + failure.location, :failed) + source
+        end
+        @io.puts
+      end
+
       def print_exception(e, status, indent)
         message = "#{e.message} (#{e.class})"
         if ENV['CUCUMBER_TRUNCATE_OUTPUT']
@@ -121,21 +140,13 @@ 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_multiline_class = step.multiline_arg ? step.multiline_arg.class : nil
-          snippet = @runtime.snippet_text(step.actual_keyword, step_name, step_multiline_class)
-          snippet
+          @runtime.snippet_text(step.actual_keyword, step_name, step.multiline_arg)
         end.compact.uniq
 
         text = "\nYou can implement step definitions for undefined steps with these snippets:\n\n"
         text += snippets.join("\n\n")
         @io.puts format_string(text, :undefined)
 
-        if unknown_programming_language
-          @io.puts format_string("\nIf you want snippets in a different programming language," +
-                                 "\njust make sure a file with the appropriate file extension" +
-                                 "\nexists where cucumber looks for step definitions.", :failed)
-        end
-
         @io.puts
         @io.flush
       end

data/lib/cucumber/formatter/debug.rb

@@ -9,6 +9,11 @@ module Cucumber
         @indent = 0
       end
 
+      def log(message)
+        return unless ENV['DEBUG']
+        @io.puts "* #{message}"
+      end
+
       def respond_to?(*args)
         true
       end

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -10,8 +10,6 @@ module Cucumber
         @gf = gherkin_formatter
         @print_empty_match = print_empty_match
         @options = options
-        @delayed_messages = []
-        @delayed_embeddings = []
       end
 
       def before_feature(feature)
@@ -21,17 +19,15 @@ module Cucumber
 
       def before_background(background)
         @outline = false
-        @delay_output = true
         @gf.background(background.gherkin_statement)
       end
 
       def before_feature_element(feature_element)
-        @delay_output = true
         case(feature_element)
-        when Ast::Scenario
+        when Core::Ast::Scenario
           @outline = false
           @gf.scenario(feature_element.gherkin_statement)
-        when Ast::ScenarioOutline
+        when Core::Ast::ScenarioOutline
           @outline = true
           if @options[:expand]
             @in_instantiated_scenario = false
@@ -62,7 +58,6 @@ module Cucumber
               @current_scenario_hash['description'],
               example_row_hash['line'],
               example_row_hash['id'])
-          @delay_output = true
           @gf.scenario(scenario)
         end
       end
@@ -70,12 +65,9 @@ module Cucumber
       def before_step(step)
         unless @outline and @options[:expand]
           @gf.step(step.gherkin_statement)
-          pass_delayed_output
-          @delay_output = false
         else 
           if @in_instantiated_scenario
             @current_step_hash = to_hash(step.gherkin_statement)
-            @delay_output = true
           end
         end
         if @print_empty_match
@@ -122,8 +114,6 @@ module Cucumber
               @current_step_hash['line'],
               @current_step_hash['rows'],
               @current_step_hash['doc_string']))
-          pass_delayed_output
-          @delay_output = false
           @gf.match(@current_match)
           @gf.result(@current_result)
         end
@@ -156,32 +146,19 @@ module Cucumber
       end
 
       def embed(file, mime_type, label)
-        if File.file?(file)
+        # Only embed if file exists
+        if File.exists?(file)
           data = File.open(file, 'rb') { |f| f.read }
-        else
-          if mime_type =~ /;base64$/
-            mime_type = mime_type[0..-8]
-            data = Base64.decode64(file)
-          else
-            data = file
+
+          if defined?(JRUBY_VERSION)
+            data = data.to_java_bytes
           end
-        end
-        if defined?(JRUBY_VERSION)
-          data = data.to_java_bytes
-        end
-        unless @delay_output
           @gf.embedding(mime_type, data)
-        else
-          @delayed_embeddings.push [mime_type, data]
         end
       end
 
       def puts(message)
-        unless @delay_output
-          @gf.write(message)
-        else
-          @delayed_messages.push message
-        end
+        @gf.write(message)
       end
 
       private
@@ -193,13 +170,6 @@ 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

@@ -1,11 +1,19 @@
 require 'erb'
-require 'cucumber/formatter/ordered_xml_markup'
+require 'builder'
 require 'cucumber/formatter/duration'
 require 'cucumber/formatter/io'
 
 module Cucumber
   module Formatter
     class Html
+
+      # TODO: remove coupling to types
+      AST_CLASSES = {
+        Cucumber::Core::Ast::Scenario        => 'scenario',
+        Cucumber::Core::Ast::ScenarioOutline => 'scenario outline'
+      }
+      AST_DATA_TABLE = Cucumber::Core::Ast::DataTable
+
       include ERB::Util # for the #h method
       include Duration
       include Io
@@ -22,17 +30,16 @@ module Cucumber
         @header_red = nil
         @delayed_messages = []
         @img_id = 0
+        @text_id = 0
         @inside_outline = false
       end
 
       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)
         end
       end
 
@@ -45,9 +52,17 @@ module Cucumber
         end
       end
 
+      def embed_text(src, label)
+        id = "text_#{@text_id}"
+        @text_id += 1
+        @builder.span(:class => 'embed') do |pre|
+          pre << %{<a id="#{id}" href="#{src}" title="#{label}">#{label}</a>}
+        end
+      end
+
 
       def before_features(features)
-        @step_count = features.step_count
+        @step_count = features && features.step_count || 0 #TODO: Make this work with core!
 
         # <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
         @builder.declare!(
@@ -158,10 +173,7 @@ module Cucumber
       def before_feature_element(feature_element)
         @scenario_number+=1
         @scenario_red = false
-        css_class = {
-          Ast::Scenario        => 'scenario',
-          Ast::ScenarioOutline => 'scenario outline'
-        }[feature_element.class]
+        css_class = AST_CLASSES[feature_element.class]
         @builder << "<div class='#{css_class}'>"
       end
 
@@ -253,9 +265,10 @@ module Cucumber
         # print snippet for undefined steps
         if status == :undefined
           keyword = @step.actual_keyword if @step.respond_to?(:actual_keyword)
-          step_multiline_class = @step.multiline_arg ? @step.multiline_arg.class : nil
           @builder.pre do |pre|
-            pre << @runtime.snippet_text(keyword,step_match.instance_variable_get("@name") || '',step_multiline_class)
+            # TODO: snippet text should be an event sent to the formatter so we don't 
+            # have this couping to the runtime.
+            pre << @runtime.snippet_text(keyword,step_match.instance_variable_get("@name") || '', @step.multiline_arg)
           end
         end
         @builder << '</li>'
@@ -283,14 +296,14 @@ module Cucumber
 
       def before_multiline_arg(multiline_arg)
         return if @hide_this_step || @skip_step
-        if Ast::Table === multiline_arg
+        if AST_DATA_TABLE === multiline_arg
           @builder << '<table>'
         end
       end
 
       def after_multiline_arg(multiline_arg)
         return if @hide_this_step || @skip_step
-        if Ast::Table === multiline_arg
+        if AST_DATA_TABLE === multiline_arg
           @builder << '</table>'
         end
       end
@@ -302,7 +315,6 @@ module Cucumber
         end
       end
 
-
       def before_table_row(table_row)
         @row_id = table_row.dom_id
         @col_index = 0
@@ -576,7 +588,7 @@ module Cucumber
       end
 
       def create_builder(io)
-        OrderedXmlMarkup.new(:target => io, :indent => 0)
+        Builder::XmlMarkup.new(:target => io, :indent => 0)
       end
 
       class SnippetExtractor #:nodoc:
@@ -602,12 +614,8 @@ module Cucumber
 
         def lines_around(file, line)
           if File.file?(file)
-            begin
             lines = File.open(file).read.split("\n")
-          rescue ArgumentError
-            return "# Couldn't get snippet for #{file}"
-          end
-          min = [0, line-3].max
+            min = [0, line-3].max
             max = [line+1, lines.length-1].min
             selected_lines = []
             selected_lines.join("\n")