casecumber 1.0.2.1 → 1.2.1.cb2

data/lib/cucumber/formatter/cucumber.css

@@ -21,7 +21,7 @@ body {
   float: right;
   margin: 0 0 0 10px;
 }
-.cucumber .scenario h3, td .scenario h3, th .scenario h3 {
+.cucumber .scenario h3, td .scenario h3, th .scenario h3, .background h3 {
   font-size: 11px;
   padding: 3px;
   margin: 0;
@@ -29,6 +29,12 @@ body {
   color: white;
   font-weight: bold;
 }
+
+.background h3 {
+  font-size: 1.2em;
+  background: #666;
+}
+
 .cucumber h1, td h1, th h1 {
   margin: 0px 10px 0px 10px;
   padding: 10px;

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -46,8 +46,8 @@ module Cucumber
         end
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
-        arguments = step_match.step_arguments.map{|a| Gherkin::Formatter::Argument.new(a.byte_offset, a.val)}
+      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
+        arguments = step_match.step_arguments.map{|a| Gherkin::Formatter::Argument.new(a.offset, a.val)}
         location = step_match.file_colon_line
         match = Gherkin::Formatter::Model::Match.new(arguments, location)
         if @print_emtpy_match
@@ -71,6 +71,10 @@ module Cucumber
         @gf.eof
       end
 
+      def after_features(features)
+        @gf.done
+      end
+
       def embed(file, mime_type, label)
         data = File.read(file)
         if defined?(JRUBY_VERSION)

data/lib/cucumber/formatter/html.rb

@@ -143,7 +143,7 @@ module Cucumber
   
       def background_name(keyword, name, file_colon_line, source_indent)
         @listing_background = true
-        @builder.h3 do |h3|
+        @builder.h3(:id => "background_#{@scenario_number}") do |h3|
           @builder.span(keyword, :class => 'keyword')
           @builder.text!(' ')
           @builder.span(name, :class => 'val')
@@ -221,7 +221,7 @@ module Cucumber
         move_progress
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         @step_match = step_match
         @hide_this_step = false
         if exception
@@ -241,7 +241,7 @@ module Cucumber
         @builder << "<li id='#{@step_id}' class='step #{status}'>"            
       end
 
-      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      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
         if status == :undefined
@@ -254,7 +254,7 @@ module Cucumber
         print_messages
       end
 
-      def step_name(keyword, step_match, status, source_indent, background)
+      def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
         @step_matches ||= []
         background_in_scenario = background && !@listing_background
         @skip_step = @step_matches.index(step_match) || background_in_scenario
@@ -291,7 +291,7 @@ module Cucumber
       def doc_string(string)
         return if @hide_this_step
         @builder.pre(:class => 'val') do |pre|
-          @builder << h(string.gsub("\n", '&#x000A;'))
+          @builder << h(string).gsub("\n", '&#x000A;')
         end
       end
   
@@ -311,7 +311,7 @@ module Cucumber
           @builder.tr do
             @builder.td(:colspan => @col_index.to_s, :class => 'failed') do
               @builder.pre do |pre|
-                pre << format_exception(table_row.exception)
+                pre << h(format_exception(table_row.exception))
               end
             end
           end
@@ -375,8 +375,14 @@ module Cucumber
           if defined?(RAILS_ROOT) && message.include?('Exception caught')
             matches = message.match(/Showing <i>(.+)<\/i>(?:.+) #(\d+)/)
             backtrace += ["#{RAILS_ROOT}/#{matches[1]}:#{matches[2]}"] if matches
-            message = message.match(/<code>([^(\/)]+)<\//m)[1]
+            matches = message.match(/<code>([^(\/)]+)<\//m)
+            message = matches ? matches[1] : ""
           end
+
+          unless exception.instance_of?(RuntimeError)
+            message = "#{message} (#{exception.class})"
+          end
+
           @builder.pre do 
             @builder.text!(message)
           end
@@ -507,7 +513,7 @@ module Cucumber
       def inline_js_content
         <<-EOF
 
-  SCENARIOS = "h3[id^='scenario_']";
+  SCENARIOS = "h3[id^='scenario_'],h3[id^=background_]";
   
   $(document).ready(function() {
     $(SCENARIOS).css('cursor', 'pointer');

data/lib/cucumber/formatter/interceptor.rb

@@ -0,0 +1,62 @@
+
+module Cucumber
+  module Formatter
+    module Interceptor
+      class Pipe
+        attr_reader :pipe, :buffer
+        def initialize(pipe)
+          @pipe = pipe
+          @buffer = []
+          @wrapped = true
+        end
+
+        def write(str)
+          @buffer << str if @wrapped
+          return @pipe.write(str)
+        end
+
+        def unwrap!
+          @wrapped = false
+          @pipe
+        end
+
+        def method_missing(method, *args, &blk)
+          @pipe.send(method, *args, &blk)
+        end
+
+        def self.validate_pipe(pipe)
+          unless [:stdout, :stderr].include? pipe
+            raise ArgumentError, '#wrap only accepts :stderr or :stdout'
+          end
+        end
+
+        def self.unwrap!(pipe)
+          validate_pipe pipe
+          wrapped = nil
+          case pipe
+          when :stdout
+            wrapped = $stdout
+            $stdout = wrapped.unwrap!
+          when :stderr
+            wrapped = $stderr
+            $stderr = wrapped.unwrap!
+          end
+          wrapped
+        end
+
+        def self.wrap(pipe)
+          validate_pipe pipe
+
+          case pipe
+          when :stderr
+            $stderr = self.new($stderr)
+            return $stderr
+          when :stdout
+            $stdout = self.new($stdout)
+            return $stdout
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/json.rb

@@ -11,20 +11,8 @@ module Cucumber
 
       def initialize(step_mother, io, options)
         @io = ensure_io(io, "json")
-        @io.write('{"features":[')
         super(Gherkin::Formatter::JSONFormatter.new(@io), false)
       end
-
-      def before_feature(feature)
-        super
-        @io.write(',') if @one
-        @one = true
-      end
-
-      def after_features(features)
-        @io.write(']}')
-        @io.flush
-      end
     end
   end
 end

data/lib/cucumber/formatter/junit.rb

@@ -1,5 +1,6 @@
 require 'cucumber/formatter/ordered_xml_markup'
 require 'cucumber/formatter/io'
+require 'cucumber/formatter/interceptor'
 require 'fileutils'
 
 module Cucumber
@@ -7,13 +8,13 @@ module Cucumber
     # The formatter used for <tt>--format junit</tt>
     class Junit
       include Io
-      
+
       class UnNamedFeatureError < StandardError
         def initialize(feature_file)
           super("The feature in '#{feature_file}' does not have a name. The JUnit XML format requires a name for the testsuite element.")
         end
       end
-      
+
       def initialize(step_mother, io, options)
         @reportdir = ensure_dir(io, "junit")
         @options = options
@@ -24,12 +25,17 @@ module Cucumber
         @failures = @errors = @tests = @skipped = 0
         @builder = OrderedXmlMarkup.new( :indent => 2 )
         @time = 0
+        # In order to fill out <system-err/> and <system-out/>, we need to
+        # intercept the $stderr and $stdout
+        @interceptedout = Interceptor::Pipe.wrap(:stdout)
+        @interceptederr = Interceptor::Pipe.wrap(:stderr)
       end
-      
+
       def before_feature_element(feature_element)
         @in_examples = Ast::ScenarioOutline === feature_element
+        @steps_start = Time.now
       end
-      
+
       def after_feature(feature)
         @testsuite = OrderedXmlMarkup.new( :indent => 2 )
         @testsuite.instruct!
@@ -41,15 +47,24 @@ module Cucumber
           :time => "%.6f" % @time,
           :name => @feature_name ) do
           @testsuite << @builder.target!
+          @testsuite.tag!('system-out') do
+            @testsuite.cdata! @interceptedout.buffer.join
+          end
+          @testsuite.tag!('system-err') do
+            @testsuite.cdata! @interceptederr.buffer.join
+          end
         end
 
         write_file(feature_result_filename(feature.file), @testsuite.target!)
+
+        Interceptor::Pipe.unwrap! :stdout
+        Interceptor::Pipe.unwrap! :stderr
       end
 
       def before_background(*args)
         @in_background = true
       end
-      
+
       def after_background(*args)
         @in_background = false
       end
@@ -66,12 +81,11 @@ module Cucumber
       end
 
       def before_steps(steps)
-        @steps_start = Time.now
       end
-      
+
       def after_steps(steps)
         return if @in_background || @in_examples
-        
+
         duration = Time.now - @steps_start
         if steps.failed?
           steps.each { |step| @output += "#{step.keyword}#{step.name}\n" }
@@ -79,12 +93,12 @@ module Cucumber
         end
         build_testcase(duration, steps.status, steps.exception)
       end
-      
+
       def before_examples(*args)
         @header_row = true
         @in_examples = true
       end
-      
+
       def after_examples(*args)
         @in_examples = false
       end
@@ -106,7 +120,7 @@ module Cucumber
           end
           build_testcase(duration, table_row.status, table_row.exception, name_suffix)
         end
-        
+
         @header_row = false if @header_row
       end
 
@@ -114,7 +128,7 @@ module Cucumber
 
       def build_testcase(duration, status, exception = nil, suffix = "")
         @time += duration
-        classname = "#{@feature_name}.#{@scenario}"
+        classname = @feature_name
         name = "#{@scenario}#{suffix}"
         pending = [:pending, :undefined].include?(status)
         passed = (status == :passed || (pending && !@options[:strict]))
@@ -131,6 +145,8 @@ module Cucumber
             @builder.skipped
             @skipped += 1
           end
+          @builder.tag!('system-out')
+          @builder.tag!('system-err')
         end
         @tests += 1
       end
@@ -138,15 +154,15 @@ module Cucumber
       def format_exception(exception)
         (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
       end
-      
+
       def feature_result_filename(feature_file)
         File.join(@reportdir, "TEST-#{basename(feature_file)}.xml")
       end
-      
+
       def basename(feature_file)
         File.basename(feature_file.gsub(/[\\\/]/, '-'), '.feature')
       end
-      
+
       def write_file(feature_filename, data)
         File.open(feature_filename, 'w') { |file| file.write(data) }
       end

data/lib/cucumber/formatter/pretty.rb

@@ -129,7 +129,7 @@ module Cucumber
         @indent = 6
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         @hide_this_step = false
         if exception
           if @exceptions.include?(exception)
@@ -145,7 +145,7 @@ module Cucumber
         @status = status
       end
 
-      def step_name(keyword, step_match, status, source_indent, background)
+      def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
         return if @hide_this_step
         source_indent = nil unless @options[:source]
         name_to_report = format_step(keyword, step_match, status, source_indent)
@@ -203,7 +203,7 @@ module Cucumber
         cell_text = escape_cell(value.to_s || '')
         padded = cell_text + (' ' * (width - cell_text.unpack('U*').length))
         prefix = cell_prefix(status)
-        @io.print(' ' + format_string("#{prefix}#{padded}", status) + ::Term::ANSIColor.reset(" |"))
+        @io.print(' ' + format_string("#{prefix}#{padded}", status) + ::Cucumber::Term::ANSIColor.reset(" |"))
         @io.flush
       end
 

data/lib/cucumber/formatter/progress.rb

@@ -37,7 +37,7 @@ module Cucumber
         @exception_raised = false
       end
 
-      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         progress(status)
         @status = status
       end

data/lib/cucumber/formatter/rerun.rb

@@ -22,9 +22,9 @@ module Cucumber
         @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end
       
-      def before_feature(*)
+      def before_feature(feature_element)
         @lines = []
-        @file = nil
+        @file = feature_element.file
       end
       
       def after_feature(*)
@@ -46,17 +46,40 @@ module Cucumber
       end
 
       def after_feature_element(feature_element)
-        if @rerun
-          file, line = *feature_element.file_colon_line.split(':')
-          @lines << line
-          @file = file
+        if (@rerun || feature_element.failed?) && !(Ast::ScenarioOutline === feature_element)
+          @lines << feature_element.line
         end
       end
 
-      def step_name(keyword, step_match, status, source_indent, background)
-        @rerun = true if [:failed, :pending, :undefined].index(status)
+      def after_table_row(table_row)
+        return unless @in_examples and Cucumber::Ast::OutlineTable::ExampleRow === table_row
+        unless @header_row
+          if table_row.failed?
+            @rerun = true
+            @lines << table_row.line
+          end
+        end
+
+        @header_row = false if @header_row
+      end
+
+      def before_examples(*args)
+        @header_row = true
+        @in_examples = true
       end
       
+      def after_examples(*args)
+        @in_examples = false
+      end
+
+      def before_table_row(table_row)
+        return unless @in_examples
+      end
+
+      def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
+        @rerun = true if [:failed, :pending, :undefined].index(status)
+      end
+
     private
     
       def after_first_time

data/lib/cucumber/formatter/usage.rb

@@ -26,7 +26,7 @@ module Cucumber
         @duration = Time.now - @start_time
       end
 
-      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         if step_match.name.nil? # nil if it's from a scenario outline
           stepdef_key = StepDefKey.new(step_match.step_definition.regexp_source, step_match.step_definition.file_colon_line)
 

data/lib/cucumber/js_support/js_language.rb

@@ -97,7 +97,7 @@ module Cucumber
         @arg
       end
 
-      def byte_offset
+      def offset
       end
     end
 

data/lib/cucumber/js_support/js_snippets.rb

@@ -1,7 +1,7 @@
 module Cucumber
   module JsSupport
     module JsSnippets
-      PARAM_PATTERN = /"([^"]*)"/
+      PARAM_PATTERN = /"(.*?)"/
       ESCAPED_PARAM_PATTERN = '"([^\\"]*)"'
 
       def snippet_text(code_keyword, step_name, multiline_arg_class)

data/lib/cucumber/language_support/language_methods.rb

@@ -4,10 +4,6 @@ require 'cucumber/step_definition_light'
 module Cucumber
   module LanguageSupport
     module LanguageMethods
-      def create_step_match(step_definition, step_name, name_to_report, step_arguments)
-        StepMatch.new(step_definition, step_name, name_to_report, step_arguments)
-      end
-
       def around(scenario)
         execute_around(scenario) do
           yield

data/lib/cucumber/parser/gherkin_builder.rb

@@ -1,5 +1,6 @@
 require 'cucumber/ast'
 require 'gherkin/rubify'
+require 'cucumber/ast/multiline_argument'
 
 module Cucumber
   module Parser
@@ -17,7 +18,7 @@ module Cucumber
         @feature = Ast::Feature.new(
           nil, 
           Ast::Comment.new(feature.comments.map{|comment| comment.value}.join("\n")), 
-          Ast::Tags.new(nil, feature.tags.map{|tag| tag.name}),
+          Ast::Tags.new(nil, feature.tags),
           feature.keyword,
           feature.name.lstrip,
           feature.description.rstrip,
@@ -46,7 +47,7 @@ module Cucumber
         scenario = Ast::Scenario.new(
           @background, 
           Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
-          Ast::Tags.new(nil, statement.tags.map{|tag| tag.name}), 
+          Ast::Tags.new(nil, statement.tags), 
           statement.line, 
           statement.keyword, 
           statement.name,
@@ -63,7 +64,7 @@ module Cucumber
         scenario_outline = Ast::ScenarioOutline.new(
           @background, 
           Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
-          Ast::Tags.new(nil, statement.tags.map{|tag| tag.name}), 
+          Ast::Tags.new(nil, statement.tags), 
           statement.line, 
           statement.keyword, 
           statement.name, 
@@ -92,17 +93,15 @@ module Cucumber
         @step_container.add_examples(examples_fields, examples)
       end
 
-      def step(step)
-        @table_owner = Ast::Step.new(step.line, step.keyword, step.name)
-        @table_owner.gherkin_statement(step)
-        multiline_arg = rubify(step.multiline_arg)
-        case(multiline_arg)
-        when Gherkin::Formatter::Model::DocString
-          @table_owner.multiline_arg = Ast::DocString.new(multiline_arg.value)
-        when Array
-          @table_owner.multiline_arg = Ast::Table.new(matrix(multiline_arg))
-        end
-        @step_container.add_step(@table_owner)
+      def step(gherkin_step)
+        step = Ast::Step.new(
+          gherkin_step.line, 
+          gherkin_step.keyword, 
+          gherkin_step.name, 
+          Ast::MultilineArgument.from(gherkin_step.doc_string || gherkin_step.rows)
+        )
+        step.gherkin_statement(gherkin_step)
+        @step_container.add_step(step)
       end
 
       def eof

data/lib/cucumber/platform.rb

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

data/lib/cucumber/py_support/py_language.rb

@@ -24,10 +24,6 @@ module Cucumber
       def alias_adverbs(adverbs)
       end
 
-      def step_definitions_for(py_file)
-        mod = import(py_file)
-      end
-
       def snippet_text(code_keyword, step_name, multiline_arg_class)
         "python snippet: #{code_keyword}, #{step_name}"
       end
@@ -35,12 +31,12 @@ module Cucumber
       def begin_scenario(scenario)
         @python_path = []
         add_to_python_path(File.dirname(__FILE__))
-        @step_def_files.each{|f| add_to_python_path(File.dirname(f))}
+        @step_def_files.each { |f| add_to_python_path(File.dirname(f)) }
 
         RubyPython.start
 
         @delegate = import(File.dirname(__FILE__) + '/py_language.py')
-        @step_def_files.each{|f| import(f)}
+        @step_def_files.each { |f| import(f) }
       end
 
       def end_scenario
@@ -56,7 +52,7 @@ module Cucumber
         modname = File.basename(path)[0...-File.extname(path).length]
         begin
           mod = RubyPython.import(modname)
-        rescue PythonError => e
+        rescue RubyPython::PythonError => e
 #          e.message << "Couldn't load #{path}\nConsider adding #{File.expand_path(File.dirname(path))} to your PYTHONPATH"
           raise e
         end

data/lib/cucumber/rb_support/rb_dsl.rb

@@ -23,8 +23,8 @@ module Cucumber
           @rb_language.register_rb_transform(regexp, proc)          
         end
 
-        def register_rb_step_definition(regexp, proc)
-          @rb_language.register_rb_step_definition(regexp, proc)
+        def register_rb_step_definition(regexp, proc_or_sym, options = {})
+          @rb_language.register_rb_step_definition(regexp, proc_or_sym, options)
         end
       end
 
@@ -98,12 +98,19 @@ module Cucumber
       # also to the i18n translations whenever a feature of a
       # new language is loaded.
       #
-      # The +&proc+ gets executed in the context of a <tt>World</tt>
-      # object, which is defined by #World. A new <tt>World</tt>
-      # object is created for each scenario and is shared across
-      # step definitions within that scenario.
-      def register_rb_step_definition(regexp, &proc)
-        RbDsl.register_rb_step_definition(regexp, proc)
+      # If provided, the +symbol+ is sent to the <tt>World</tt> object
+      # as defined by #World. A new <tt>World</tt> object is created
+      # for each scenario and is shared across step definitions within
+      # that scenario. If the +options+ hash contains an <tt>:on</tt>
+      # key, the value for this is assumed to be a proc. This proc
+      # will be executed in the context of the <tt>World</tt> object
+      # and then sent the +symbol+.
+      #
+      # If no +symbol+ if provided then the +&proc+ gets executed in
+      # the context of the <tt>World</tt> object.
+      def register_rb_step_definition(regexp, symbol = nil, options = {}, &proc)
+        proc_or_sym = symbol || proc
+        RbDsl.register_rb_step_definition(regexp, proc_or_sym, options)
       end
     end
   end

data/lib/cucumber/rb_support/rb_language.rb

@@ -65,20 +65,6 @@ module Cucumber
         end
       end
 
-      # Gets called for each file under features (or whatever is overridden
-      # with --require).
-      def step_definitions_for(rb_file) # Looks Unused - Delete?
-        begin
-          require rb_file # This will cause self.add_step_definition and self.add_hook to be called from RbDsl
-          step_definitions
-        rescue LoadError => e
-          e.message << "\nFailed to load #{code_file}"
-          raise e
-        ensure
-          @step_definitions = nil
-        end
-      end
-      
       def step_matches(name_to_match, name_to_format)
         @step_definitions.map do |step_definition|
           if(arguments = step_definition.arguments_from(name_to_match))
@@ -89,7 +75,7 @@ module Cucumber
         end.compact
       end
 
-      ARGUMENT_PATTERNS = ['"([^"]*)"', '(\d+)']
+      ARGUMENT_PATTERNS = ['"(.*?)"', '(\d+)']
 
       def snippet_text(code_keyword, step_name, multiline_arg_class)
         snippet_pattern = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
@@ -124,8 +110,8 @@ module Cucumber
         add_transform(RbTransform.new(self, regexp, proc))
       end
 
-      def register_rb_step_definition(regexp, proc)
-        step_definition = RbStepDefinition.new(self, regexp, proc)
+      def register_rb_step_definition(regexp, proc_or_sym, options)
+        step_definition = RbStepDefinition.new(self, regexp, proc_or_sym, options)
         @step_definitions << step_definition
         step_definition
       end