cucumber 0.8.5 → 0.8.6

data/lib/cucumber/formatter/html.rb

@@ -20,20 +20,23 @@ module Cucumber
         @scenario_number = 0
         @step_number = 0
         @header_red = nil
+        @delayed_messages = []
+        @img_id = 0
       end
 
-      def embed(file, mime_type)
+      def embed(src, mime_type, label)
         case(mime_type)
         when /^image\/(png|gif|jpg|jpeg)/
-          embed_image(file)
+          embed_image(src, label)
         end
       end
 
-      def embed_image(file)
-        id = file.hash
+      def embed_image(src, label)
+        id = "img_#{@img_id}"
+        @img_id += 1
         @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">Screenshot</a><br>&nbsp;
-          <img id="#{id}" style="display: none" src="#{file}"/>}
+          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
 
@@ -163,6 +166,9 @@ module Cucumber
       end
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
+        @builder.span(:class => 'scenario_file') do
+          @builder << file_colon_line
+        end
         @listing_background = false
         @builder.h3(:id => "scenario_#{@scenario_number}") do
           @builder.span(keyword + ':', :class => 'keyword')
@@ -245,6 +251,7 @@ module Cucumber
           end
         end
         @builder << '</li>'
+        print_messages
       end
 
       def step_name(keyword, step_match, status, source_indent, background)
@@ -281,7 +288,7 @@ module Cucumber
         end
       end
 
-      def py_string(string)
+      def doc_string(string)
         return if @hide_this_step
         @builder.pre(:class => 'val') do |pre|
           @builder << string.gsub("\n", '&#x000A;')
@@ -298,6 +305,7 @@ module Cucumber
   
       def after_table_row(table_row)
         return if @hide_this_step
+        print_table_row_messages
         @builder << '</tr>'
         if table_row.exception
           @builder.tr do
@@ -327,8 +335,35 @@ module Cucumber
         @col_index += 1
       end
 
-      def announce(announcement)
-        @builder.pre(announcement, :class => 'announcement')
+      def puts(message)
+        @delayed_messages << message
+        #@builder.pre(message, :class => 'message')
+      end
+      
+      def print_messages
+        return if @delayed_messages.empty?
+        
+        #@builder.ol do
+          @delayed_messages.each do |ann|
+            @builder.li(:class => 'step message') do
+              @builder << ann
+            end
+          end
+        #end
+        empty_messages
+      end
+      
+      def print_table_row_messages
+        return if @delayed_messages.empty?
+        
+        @builder.td(:class => 'message') do
+          @builder << @delayed_messages.join(", ")
+        end
+        empty_messages
+      end
+      
+      def empty_messages
+        @delayed_messages = []
       end
 
       protected
@@ -358,7 +393,7 @@ module Cucumber
       end
 
       def set_scenario_color(status)
-        if status == :undefined
+        if status == :undefined or status == :pending
           set_scenario_color_pending
         end
         if status == :failed
@@ -523,7 +558,7 @@ module Cucumber
       end
 
       def backtrace_line(line)
-        line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*)/) do
+        line.gsub(/\A([^:]*\.(?:rb|feature|haml)):(\d*).*\z/) do
           if ENV['TM_PROJECT_DIRECTORY']
             "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
           else

data/lib/cucumber/formatter/io.rb

@@ -1,11 +1,9 @@
-require 'cucumber/formatter/color_io'
-
 module Cucumber
   module Formatter
     module Io
       def ensure_io(path_or_io, name)
         return nil if path_or_io.nil?
-        return path_or_io if ColorIO === path_or_io || path_or_io.respond_to?(:write)
+        return path_or_io if path_or_io.respond_to?(:write)
         file = File.open(path_or_io, Cucumber.file_mode('w'))
         at_exit do
           unless file.closed?
@@ -30,4 +28,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/formatter/json.rb

@@ -1,166 +1,29 @@
-require "json"
-require "cucumber/formatter/io"
+require 'cucumber/formatter/gherkin_formatter_adapter'
+require 'cucumber/formatter/io'
+require 'gherkin/formatter/argument'
+require 'gherkin/formatter/json_formatter'
 
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format json</tt>
-    class Json
-      class Error < StandardError
-      end
-
+    class Json < GherkinFormatterAdapter
       include Io
 
       def initialize(step_mother, io, options)
-        @io      = ensure_io(io, "json")
-        @options = options
-      end
-
-      def before_features(features)
-        @json = {:features => []}
-      end
-
-      def before_feature(feature)
-        @current_object = {:file => feature.file, :name => feature.name}
-        @json[:features] << @current_object
-      end
-
-      def before_tags(tags)
-        @current_object[:tags] = tags.tag_names.to_a
-      end
-
-      def before_background(background)
-        background = {}
-        @current_object[:background] = background
-        @current_object = background
-      end
-
-      def after_background(background)
-        @current_object = last_feature
-      end
-
-      def before_feature_element(feature_element)
-        elements = @current_object[:elements] ||= []
-
-        # change current object to the feature_element
-        @current_object = {}
-        elements << @current_object
-      end
-
-      def scenario_name(keyword, name, file_colon_line, source_indent)
-        @current_object[:keyword] = keyword
-        @current_object[:name] = name
-        @current_object[:file_colon_line] = file_colon_line
-      end
-
-      def before_steps(steps)
-        @current_object[:steps] = []
-      end
-
-      def before_step(step)
-        @current_step = {}
-        @current_object[:steps] << @current_step
+        @io = ensure_io(io, "json")
+        @obj = {'features' => []}
+        super(Gherkin::Formatter::JSONFormatter.new(nil), false)
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
-        if exception
-          @current_step[:exception] = exception_hash_for(exception)
-        end
-      end
-
-      def step_name(keyword, step_match, status, source_indent, background)
-        @current_step[:status]          = status
-        @current_step[:keyword]         = keyword
-        @current_step[:name]            = "#{step_match.name || step_match.format_args}"
-        @current_step[:file_colon_line] = step_match.file_colon_line
-      end
-
-      def after_step(step)
-        @current_step = nil
-      end
-
-      def before_examples(examples)
-        @current_object[:examples] = {}
-      end
-
-      def examples_name(keyword, name)
-        @current_object[:examples][:name] = "#{keyword} #{name}"
-      end
-
-      def before_outline_table(*args)
-        @current_object[:examples][:table] = []
-      end
-
-      def before_table_row(row)
-        @current_row = {:cells => []}
-
-        if @current_object.member? :examples
-          @current_object[:examples][:table] << @current_row
-        elsif @current_step
-          (@current_step[:table] ||= []) << @current_row
-        else
-          internal_error
-        end
-      end
-
-      def table_cell_value(value, status)
-        @current_row[:cells] << {:text => value, :status => status}
-      end
-
-      def after_table_row(row)
-        if row.exception
-          @current_row[:exception] = exception_hash_for(row.exception)
-        end
-        @current_row = nil
-      end
-
-      def py_string(string)
-        @current_step[:py_string] = string
-      end
-
-      def after_feature_element(feature_element)
-        # change current object back to the last feature
-        @current_object = last_feature
+      def after_feature(feature)
+        super
+        @obj['features'] << @gf.gherkin_object
       end
 
       def after_features(features)
-        @io.write json_string
-        @io.flush
+        @io.write(@obj.to_json)
       end
-
-      def embed(file, mime_type)
-        obj = @current_step || @current_object
-        obj[:embedded] ||= []
-
-        obj[:embedded] << {
-          :file      => file,
-          :mime_type => mime_type,
-          :data      => [File.read(file)].pack("m*") # base64
-        }
-      end
-
-      private
-
-      def json_string
-        @json.to_json
-      end
-
-      def last_feature
-        @json[:features].last
-      end
-
-      def exception_hash_for(e)
-        {
-          :class     => e.class.name,
-          :message   => e.message,
-          :backtrace => e.backtrace
-        }
-      end
-
-      def internal_error
-        raise Error, "you've found a bug in the JSON formatter!"
-      end
-
-    end # Json
-  end # Formatter
-end # Cucumber
+    end
+  end
+end
 

data/lib/cucumber/formatter/json_pretty.rb

@@ -1,14 +1,13 @@
-require "cucumber/formatter/json"
+require 'cucumber/formatter/json'
 
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format json_pretty</tt>
     class JsonPretty < Json
-
-      def json_string
-        JSON.pretty_generate @json
+      def after_features(features)
+        @io.write(JSON.pretty_generate(@obj))
       end
-
     end
   end
-end
+end
+

data/lib/cucumber/formatter/junit.rb

@@ -21,17 +21,22 @@ module Cucumber
 
       def before_feature(feature)
         @current_feature = feature
-        @failures = @errors = @tests = 0
+        @failures = @errors = @tests = @skipped = 0
         @builder = OrderedXmlMarkup.new( :indent => 2 )
         @time = 0
       end
       
+      def before_feature_element(feature_element)
+        @in_examples = Ast::ScenarioOutline === feature_element
+      end
+      
       def after_feature(feature)
         @testsuite = OrderedXmlMarkup.new( :indent => 2 )
         @testsuite.instruct!
         @testsuite.testsuite(
           :failures => @failures,
           :errors => @errors,
+          :skipped => @skipped,
           :tests => @tests,
           :time => "%.6f" % @time,
           :name => @feature_name ) do
@@ -56,13 +61,8 @@ module Cucumber
       end
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
-        # TODO: What's all this ugly weird code doing? Why not just use keyword and name????
-        scenario_name = name.strip.delete(".\r\n")
-        scenario_name = "Unnamed scenario" if name == ""
-        @scenario = scenario_name
-        description = "Scenario"
-        description << " outline" if keyword.include?('Scenario Outline')
-        @output = "#{description}: #{@scenario}\n\n"
+        @scenario = (name.nil? || name == "") ? "Unnamed scenario" : name.split("\n")[0]
+        @output = "#{keyword}: #{@scenario}\n\n"
       end
 
       def before_steps(steps)
@@ -96,7 +96,7 @@ module Cucumber
       end
 
       def after_table_row(table_row)
-        return unless @in_examples
+        return unless @in_examples and Cucumber::Ast::OutlineTable::ExampleRow === table_row
         duration = Time.now - @table_start
         unless @header_row
           name_suffix = " (outline example : #{table_row.name})"
@@ -116,20 +116,23 @@ module Cucumber
         @time += duration
         classname = "#{@feature_name}.#{@scenario}"
         name = "#{@scenario}#{suffix}"
-        failed = (status == :failed || (status == :pending && @options[:strict]))
-        #puts "FAILED:!!#{failed}"
-        if status == :passed || failed
-          @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
-            if failed
-              @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
-                @builder.text! @output
-                @builder.text!(format_exception(exception)) if exception
-              end
-              @failures += 1
+        pending = [:pending, :undefined].include?(status)
+        passed = (status == :passed || (pending && !@options[:strict]))
+
+        @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
+          unless passed
+            @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
+              @builder.cdata! @output
+              @builder.cdata!(format_exception(exception)) if exception
             end
+            @failures += 1
+          end
+          if passed and (status == :skipped || pending)
+            @builder.skipped
+            @skipped += 1
           end
-          @tests += 1
         end
+        @tests += 1
       end
 
       def format_exception(exception)
@@ -137,9 +140,12 @@ module Cucumber
       end
       
       def feature_result_filename(feature_file)
+        File.join(@reportdir, "TEST-#{basename(feature_file)}.xml")
+      end
+      
+      def basename(feature_file)
         ext_length = File.extname(feature_file).length
-        basename = File.basename(feature_file)[0...-ext_length]
-        File.join(@reportdir, "TEST-#{basename}.xml")
+        feature_file.gsub('features/', '').gsub(File::SEPARATOR, '_')[0...-ext_length]
       end
       
       def write_file(feature_filename, data)

data/lib/cucumber/formatter/pdf.rb

@@ -28,9 +28,9 @@ module Cucumber
         @file = ensure_file(path_or_io, "pdf")
 
         if(options[:dry_run])
-          @status_colors = { :passed => BLACK, :skipped => BLACK, :undefined => BLACK, :failed => BLACK, :announced => GREY}
+          @status_colors = { :passed => BLACK, :skipped => BLACK, :undefined => BLACK, :failed => BLACK, :putsd => GREY}
         else
-          @status_colors = { :passed => '055902', :skipped => GREY, :undefined => 'F27405', :failed => '730202', :announced => GREY}
+          @status_colors = { :passed => '055902', :skipped => GREY, :undefined => 'F27405', :failed => '730202', :putsd => GREY}
         end
 
         @pdf = Prawn::Document.new
@@ -71,9 +71,9 @@ module Cucumber
         end
       end
 
-      def announce(announcement)
-        @pdf.fill_color(@status_colors[:announced])  
-        @pdf.text announcement, :size => 10
+      def puts(message)
+        @pdf.fill_color(@status_colors[:putsd])  
+        @pdf.text message, :size => 10
         @pdf.fill_color BLACK
       end
 
@@ -172,7 +172,7 @@ module Cucumber
         end
       end
 
-      def before_py_string(string)
+      def before_doc_string(string)
         return if @hide_this_step
         s = %{"""\n#{string}\n"""}.indent(10)
         s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}