cucumber 1.3.10 → 2.0.0

data/lib/cucumber/formatter/html.rb

@@ -1,11 +1,20 @@
 require 'erb'
-require 'cucumber/formatter/ordered_xml_markup'
+require 'builder'
 require 'cucumber/formatter/duration'
 require 'cucumber/formatter/io'
+require 'pathname'
 
 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 = LegacyApi::Ast::MultilineArg::DataTable
+
       include ERB::Util # for the #h method
       include Duration
       include Io
@@ -22,28 +31,48 @@ module Cucumber
         @header_red = nil
         @delayed_messages = []
         @img_id = 0
+        @text_id = 0
         @inside_outline = false
+        @previous_step_keyword = nil
       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
 
       def embed_image(src, label)
         id = "img_#{@img_id}"
         @img_id += 1
+        if @io.respond_to?(:path) and File.file?(src)
+          out_dir = Pathname.new(File.dirname(File.absolute_path(@io.path)))
+          src = Pathname.new(File.absolute_path(src)).relative_path_from(out_dir)
+        end        
         @builder.span(:class => 'embed') do |pre|
           pre << %{<a href="" onclick="img=document.getElementById('#{id}'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false">#{label}</a><br>&nbsp;
           <img id="#{id}" style="display: none" src="#{src}"/>}
         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!(
@@ -132,6 +161,10 @@ module Cucumber
         end
       end
 
+      def before_test_case(test_case)
+        @previous_step_keyword = nil
+      end
+
       def before_background(background)
         @in_background = true
         @builder << '<div class="background">'
@@ -154,16 +187,18 @@ 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}'>"
+        @in_scenario_outline = feature_element.class == Cucumber::Core::Ast::ScenarioOutline
       end
 
       def after_feature_element(feature_element)
+        unless @in_scenario_outline
+          print_messages
+          @builder << '</ol>'
+        end
         @builder << '</div>'
-        @open_step_list = true
+        @in_scenario_outline = nil
       end
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
@@ -191,7 +226,7 @@ module Cucumber
       end
 
       def before_examples(examples)
-         @builder << '<div class="examples">'
+        @builder << '<div class="examples">'
       end
 
       def after_examples(examples)
@@ -211,10 +246,12 @@ module Cucumber
       end
 
       def after_steps(steps)
-        @builder << '</ol>'
+        print_messages
+        @builder << '</ol>' if @in_background or @in_scenario_outline
       end
 
       def before_step(step)
+        print_messages
         @step_id = step.dom_id
         @step_number += 1
         @step = step
@@ -247,11 +284,15 @@ module Cucumber
       def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         return if @hide_this_step
         # print snippet for undefined steps
+        unless outline_step?(@step)
+          keyword = @step.actual_keyword(@previous_step_keyword)
+          @previous_step_keyword = keyword
+        end
         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>'
@@ -269,6 +310,7 @@ module Cucumber
 
       def exception(exception, status)
         return if @hide_this_step
+        print_messages
         build_exception_detail(exception)
       end
 
@@ -279,14 +321,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
@@ -298,7 +340,6 @@ module Cucumber
         end
       end
 
-
       def before_table_row(table_row)
         @row_id = table_row.dom_id
         @col_index = 0
@@ -534,7 +575,7 @@ module Cucumber
       end
 
       def backtrace_line(line)
-        line.gsub(/\A([^:]*\.(?:rb|feature|haml)):(\d*).*\z/) do
+        line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*).*$/) do
           if ENV['TM_PROJECT_DIRECTORY']
             "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
           else
@@ -572,7 +613,11 @@ module Cucumber
       end
 
       def create_builder(io)
-        OrderedXmlMarkup.new(:target => io, :indent => 0)
+        Builder::XmlMarkup.new(:target => io, :indent => 0)
+      end
+
+      def outline_step?(step)
+        not @step.step.respond_to?(:actual_keyword)
       end
 
       class SnippetExtractor #:nodoc:
@@ -598,8 +643,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/ignore_missing_messages.rb

@@ -0,0 +1,20 @@
+module Cucumber
+  module Formatter
+
+    class IgnoreMissingMessages < BasicObject
+      def initialize(receiver)
+        @receiver = receiver
+      end
+
+      def method_missing(message, *args)
+        @receiver.send(message, *args) if @receiver.respond_to?(message)
+      end
+
+      def respond_to_missing?(name, include_private = false)
+        @receiver.respond_to?(name, include_private)
+      end
+    end
+
+  end
+end
+

data/lib/cucumber/formatter/interceptor.rb

@@ -1,9 +1,10 @@
+require 'thread'
 
 module Cucumber
   module Formatter
     module Interceptor
       class Pipe
-        attr_reader :pipe, :buffer
+        attr_reader :pipe
         def initialize(pipe)
           @pipe = pipe
           @buffer = []
@@ -11,8 +12,16 @@ module Cucumber
         end
 
         def write(str)
-          @buffer << str if @wrapped
-          return @pipe.write(str)
+          lock.synchronize do 
+            @buffer << str if @wrapped
+            return @pipe.write(str)
+          end
+        end
+
+        def buffer
+          lock.synchronize do
+            return @buffer.dup
+          end
         end
 
         def unwrap!
@@ -60,6 +69,11 @@ module Cucumber
             return $stdout
           end
         end
+
+      private
+        def lock
+          @lock||=Mutex.new
+        end
       end
     end
   end

data/lib/cucumber/formatter/json.rb

@@ -11,7 +11,7 @@ module Cucumber
 
       def initialize(runtime, io, options)
         @io = ensure_io(io, "json")
-        super(Gherkin::Formatter::JSONFormatter.new(@io), false)
+        super(Gherkin::Formatter::JSONFormatter.new(@io), false, options)
       end
     end
   end

data/lib/cucumber/formatter/junit.rb

@@ -1,4 +1,4 @@
-require 'cucumber/formatter/ordered_xml_markup'
+require 'builder'
 require 'cucumber/formatter/io'
 require 'cucumber/formatter/interceptor'
 require 'fileutils'
@@ -7,6 +7,11 @@ module Cucumber
   module Formatter
     # The formatter used for <tt>--format junit</tt>
     class Junit
+
+      # TODO: remove coupling to types
+      AST_SCENARIO_OUTLINE = Core::Ast::ScenarioOutline
+      AST_EXAMPLE_ROW = LegacyApi::Ast::ExampleTableRow
+
       include Io
 
       class UnNamedFeatureError < StandardError
@@ -23,7 +28,7 @@ module Cucumber
       def before_feature(feature)
         @current_feature = feature
         @failures = @errors = @tests = @skipped = 0
-        @builder = OrderedXmlMarkup.new( :indent => 2 )
+        @builder = Builder::XmlMarkup.new( :indent => 2 )
         @time = 0
         # In order to fill out <system-err/> and <system-out/>, we need to
         # intercept the $stderr and $stdout
@@ -32,12 +37,12 @@ module Cucumber
       end
 
       def before_feature_element(feature_element)
-        @in_examples = Ast::ScenarioOutline === feature_element
+        @in_examples = AST_SCENARIO_OUTLINE === feature_element
         @steps_start = Time.now
       end
 
       def after_feature(feature)
-        @testsuite = OrderedXmlMarkup.new( :indent => 2 )
+        @testsuite = Builder::XmlMarkup.new( :indent => 2 )
         @testsuite.instruct!
         @testsuite.testsuite(
           :failures => @failures,
@@ -110,7 +115,7 @@ module Cucumber
       end
 
       def after_table_row(table_row)
-        return unless @in_examples and Cucumber::Ast::OutlineTable::ExampleRow === table_row
+        return unless @in_examples and AST_EXAMPLE_ROW === table_row
         duration = Time.now - @table_start
         unless @header_row
           name_suffix = " (outline example : #{table_row.name})"
@@ -124,6 +129,34 @@ module Cucumber
         @header_row = false if @header_row
       end
 
+      def before_test_case(test_case)
+        if @options[:expand] and test_case.keyword == "Scenario Outline"
+          @exception = nil
+        end
+      end
+
+      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
+        if @options[:expand] and @in_examples
+          if not @exception and exception
+            @exception = exception
+          end
+        end
+      end
+
+      def after_test_case(test_case, result)
+        if @options[:expand] and test_case.keyword == "Scenario Outline"
+          test_case_name = NameBuilder.new(test_case)
+          @scenario = test_case_name.outline_name
+          @output = "#{test_case.keyword}: #{@scenario}\n\n"
+          if result.failed?
+            @output += "Example row: #{test_case_name.row_name}\n"
+            @output += "\nMessage:\n"
+          end
+          test_case_result = ResultBuilder.new(result)
+          build_testcase(test_case_result.test_case_duration, test_case_result.status, @exception, test_case_name.name_suffix)
+        end
+      end
+
       private
 
       def build_testcase(duration, status, exception = nil, suffix = "")
@@ -171,5 +204,72 @@ module Cucumber
       end
       
     end
+
+    class NameBuilder
+      attr_reader :outline_name, :name_suffix, :row_name
+
+      def initialize(test_case)
+        test_case.describe_source_to self
+      end
+
+      def feature(*)
+        self
+      end
+
+      def scenario(*)
+        self
+      end
+
+      def scenario_outline(outline)
+        @outline_name = outline.name
+        self
+      end
+
+      def examples_table(*)
+        self
+      end
+
+      def examples_table_row(row)
+        @row_name = '| ' + row.values.join(' | ') + ' |'
+        @name_suffix = " (outline example : #{@row_name})"
+        self
+      end
+    end
+
+    class ResultBuilder
+      attr_reader :status, :test_case_duration
+      def initialize(result)
+        @test_case_duration = 0
+        result.describe_to(self)
+      end
+
+      def passed
+        @status = :passed
+      end
+
+      def failed
+        @status = :failed
+      end
+
+      def undefined
+        @status = :undefined
+      end
+
+      def skipped
+        @status = :skipped
+      end
+
+      def pending(*)
+        @status = :pending
+      end
+
+      def exception(*)
+      end
+
+      def duration(duration, *)
+        duration.tap { |duration| @test_case_duration = duration.nanoseconds / 10 ** 9.0 }
+      end
+    end
+
   end
 end