cucumber 1.1.9 → 1.2.0

data/features/backtraces.feature

@@ -0,0 +1,36 @@
+Feature: Backtraces
+  In order to discover errors quickly
+  As a cuker
+  I want to see backtraces for failures
+
+  Background:
+    Given a file named "features/failing_hard.feature" with:
+      """
+      Feature: Sample
+        Scenario: Example
+          Given failing
+      """
+
+  @jruby
+  Scenario: Backtraces enabled
+    Given a file named "features/step_definitions/steps.rb" with:
+      """
+      require 'java'
+      java_import 'java.util.Collections'
+
+      Given /^failing$/ do
+        Collections.empty_list.add 1
+      end
+      """
+    When I run `cucumber features/failing_hard.feature`
+    Then it should fail with:
+      """
+      Feature: Sample
+
+        Scenario: Example # features/failing_hard.feature:2
+          Given failing   # features/step_definitions/steps.rb:4
+            java.lang.UnsupportedOperationException: null (NativeException)
+            java/util/AbstractList.java:131:in `add'
+            java/util/AbstractList.java:91:in `add'
+      """
+

data/features/{issue_117.feature → drb_server_integration.feature}

@@ -1,5 +1,5 @@
-@spork @my_issues
-Feature: DRb Server Integration: Regression test for Issue #117
+@drb
+Feature: DRb Server Integration
   To prevent waiting for Rails and other large Ruby applications to load their environments
   for each feature run Cucumber ships with a DRb client that can speak to a server which
   loads up the environment only once.
@@ -60,4 +60,4 @@ Feature: DRb Server Integration: Regression test for Issue #117
     And it should pass with:
     """
     1 step (1 passed)
-    """
+    """

data/features/formatter_step_file_colon_line.feature

@@ -0,0 +1,46 @@
+Feature: Formatter API: Step file path and line number (Issue #179)
+  To all reporter to understand location of current executing step let's fetch this information
+  from step/step_invocation and pass to reporters
+
+  Scenario: my own formatter
+    Given a file named "features/f.feature" with:
+      """
+      Feature: I'll use my own
+        because I'm worth it
+        Scenario: just print step current line and feature file name
+          Given step at line 4
+          Given step at line 5
+      """
+    And a file named "features/step_definitions/steps.rb" with:
+      """
+      Given /^step at line (.*)$/ do |line|
+      end
+      """
+    And a file named "features/support/jb/formatter.rb" with:
+      """
+      module Jb
+        class Formatter
+          def initialize(step_mother, io, options)
+            @step_mother = step_mother
+            @io = io
+          end
+
+          def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
+            @io.puts "step result event: #{file_colon_line}"
+          end
+
+          def step_name(keyword, step_match, status, source_indent, background, file_colon_line)
+            @io.puts "step name event: #{file_colon_line}"
+          end
+        end
+      end
+      """
+    When I run cucumber "features/f.feature --format Jb::Formatter"
+    Then it should pass with exactly:
+      """
+      step result event: features/f.feature:4
+      step name event: features/f.feature:4
+      step result event: features/f.feature:5
+      step name event: features/f.feature:5
+
+      """

data/features/{issue_57.feature → rerun_formatter.feature}

@@ -1,5 +1,5 @@
-Feature: Rerun formatter: Test for Issue #57
-  details see https://github.com/cucumber/cucumber/issues/57
+Feature: Rerun formatter
+  For details see https://github.com/cucumber/cucumber/issues/57
 
   Background:
     Given a file named "features/one_passing_one_failing.feature" with:

data/features/run_specific_scenarios.feature

@@ -0,0 +1,47 @@
+Feature: Run specific scenarios
+
+  You can choose to run a specific scenario using the file:line format
+
+  Background:
+    Given a file named "features/step_definitions/steps.rb" with:
+      """
+      Given(/pass/) {}
+      Given(/fail/) { raise "Failed" }
+      """
+
+  Scenario: Two scenarios, run just one of them
+    Given a file named "features/test.feature" with:
+      """
+      Feature: 
+        Scenario:
+          Given this is undefined
+
+        Scenario: Hit
+          Given this passes
+      """
+    When I run `cucumber features/test.feature:5 -f progress`
+    Then it should pass with:
+      """
+      1 scenario (1 passed)
+      """
+
+  Scenario: Single example from a scenario outline
+    Given a file named "features/test.feature" with:
+      """
+      Feature:
+        Scenario Outline:
+          Given this <something>
+
+          Examples:
+            | something    |
+            | is undefined |
+            | fails        |
+
+        Scenario: Miss
+          Given this passes
+      """
+    When I run `cucumber features/test.feature:8 -f progress`
+    Then it should fail with:
+      """
+      1 scenario (1 failed)
+      """

data/gem_tasks/cucumber.rake

@@ -1,21 +1,28 @@
 require 'cucumber/rake/task'
 require 'cucumber/platform'
 
+class Cucumber::Rake::Task
+  def set_profile_for_current_ruby
+    self.profile = if(Cucumber::JRUBY)
+      Cucumber::WINDOWS ? 'jruby_win' : 'jruby'
+    elsif(Cucumber::WINDOWS_MRI)
+      'windows_mri'
+    elsif(Cucumber::RUBY_1_9)
+      'ruby_1_9'
+    end
+  end
+end
+
 Cucumber::Rake::Task.new(:features) do |t|
   t.fork = false
+  t.set_profile_for_current_ruby
 end
 
 Cucumber::Rake::Task.new(:legacy_features) do |t|
   t.fork = false
   t.cucumber_opts = %w{legacy_features}
-  if(Cucumber::JRUBY)
-    t.profile = Cucumber::WINDOWS ? 'jruby_win' : 'jruby'
-  elsif(Cucumber::WINDOWS_MRI)
-    t.profile = 'windows_mri'
-  elsif(Cucumber::RUBY_1_9)
-    t.profile = 'ruby_1_9'
-  end
+  t.set_profile_for_current_ruby
   t.rcov = ENV['RCOV']
 end
 
-task :cucumber => [:features, :legacy_features]
+task :cucumber => [:features, :legacy_features]

data/legacy_features/cucumber_cli.feature

@@ -551,13 +551,6 @@ Feature: Cucumber command line
 
       """
 
-  # Fails on 1.9 because of encoding issues.
-  @fails_on_1_9
-  Scenario: Generate PDF with pdf formatter
-    When I run cucumber --format pdf --out tmp/sample.pdf --dry-run features/sample.feature
-    Then STDERR should be empty
-    Then "fixtures/self_test/tmp/sample.pdf" should match "Pages 2"
-
   Scenario: Run feature elements which match a name using -n
     When I run cucumber -n Pisang -q features/
     Then STDERR should be empty

data/legacy_features/junit_formatter.feature

@@ -16,9 +16,11 @@ Feature: JUnit output formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="1" name="One passing scenario, one failing scenario" skipped="0" tests="2" time="0.005">
-      <testcase classname="One passing scenario, one failing scenario.Passing" name="Passing" time="0.005">
+      <testcase classname="One passing scenario, one failing scenario" name="Passing" time="0.005">
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="One passing scenario, one failing scenario.Failing" name="Failing" time="0.005">
+      <testcase classname="One passing scenario, one failing scenario" name="Failing" time="0.005">
         <failure message="failed Failing" type="failed">
           <![CDATA[Scenario: Failing
 
@@ -29,7 +31,15 @@ Feature: JUnit output formatter
           <![CDATA[ (RuntimeError)
 	features/one_passing_one_failing.feature:7:in `Given a failing scenario']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
 
       """
@@ -44,9 +54,11 @@ Feature: JUnit output formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="1" name="Subdirectory - One passing scenario, one failing scenario" skipped="0" tests="2" time="0.005">
-      <testcase classname="Subdirectory - One passing scenario, one failing scenario.Passing" name="Passing" time="0.005">
+      <testcase classname="Subdirectory - One passing scenario, one failing scenario" name="Passing" time="0.005">
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="Subdirectory - One passing scenario, one failing scenario.Failing" name="Failing" time="0.005">
+      <testcase classname="Subdirectory - One passing scenario, one failing scenario" name="Failing" time="0.005">
         <failure message="failed Failing" type="failed">
           <![CDATA[Scenario: Failing
 
@@ -57,7 +69,15 @@ Feature: JUnit output formatter
           <![CDATA[ (RuntimeError)
 	features/some_subdirectory/one_passing_one_failing.feature:7:in `Given a failing scenario']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
 
       """
@@ -72,12 +92,22 @@ Feature: JUnit output formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="0" name="Pending step" skipped="2" tests="2" time="0.009">
-      <testcase classname="Pending step.Pending" name="Pending" time="0.009">
+      <testcase classname="Pending step" name="Pending" time="0.009">
         <skipped/>
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="Pending step.Undefined" name="Undefined" time="0.009">
+      <testcase classname="Pending step" name="Undefined" time="0.009">
         <skipped/>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
       
       """
@@ -92,7 +122,7 @@ Feature: JUnit output formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="2" name="Pending step" skipped="0" tests="2" time="0.000160">
-      <testcase classname="Pending step.Pending" name="Pending" time="0.000160">
+      <testcase classname="Pending step" name="Pending" time="0.000160">
         <failure message="pending Pending" type="pending">
           <![CDATA[Scenario: Pending
 
@@ -100,8 +130,10 @@ Feature: JUnit output formatter
           <![CDATA[TODO (Cucumber::Pending)
       features/pending.feature:4:in `Given a pending step']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="Pending step.Undefined" name="Undefined" time="0.000160">
+      <testcase classname="Pending step" name="Undefined" time="0.000160">
         <failure message="undefined Undefined" type="undefined">
           <![CDATA[Scenario: Undefined
       
@@ -109,7 +141,15 @@ Feature: JUnit output formatter
           <![CDATA[Undefined step: "an undefined step" (Cucumber::Undefined)
       features/pending.feature:7:in `Given an undefined step']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
 
       """
@@ -144,9 +184,11 @@ You \*must\* specify \-\-out DIR for the junit formatter
       """
       <?xml version="1.0" encoding="UTF-8"?>
       <testsuite errors="0" failures="1" name="Scenario outlines" skipped="0" tests="2" time="0.005">
-      <testcase classname="Scenario outlines.Using scenario outlines" name="Using scenario outlines (outline example : | passing |)" time="0.005">
+      <testcase classname="Scenario outlines" name="Using scenario outlines (outline example : | passing |)" time="0.005">
+        <system-out/>
+        <system-err/>
       </testcase>
-      <testcase classname="Scenario outlines.Using scenario outlines" name="Using scenario outlines (outline example : | failing |)" time="0.005">
+      <testcase classname="Scenario outlines" name="Using scenario outlines (outline example : | failing |)" time="0.005">
         <failure message="failed Using scenario outlines (outline example : | failing |)" type="failed">
           <![CDATA[Scenario Outline: Using scenario outlines
       
@@ -157,7 +199,15 @@ You \*must\* specify \-\-out DIR for the junit formatter
           <![CDATA[ (RuntimeError)
       features/scenario_outline.feature:4:in `Given a <type> scenario']]>
         </failure>
+        <system-out/>
+        <system-err/>
       </testcase>
+        <system-out>
+          <![CDATA[]]>
+        </system-out>
+        <system-err>
+          <![CDATA[]]>
+        </system-err>
       </testsuite>
 
       """

data/legacy_features/language_help.feature

@@ -31,6 +31,7 @@ Feature: Language help
       """
             | ar        | Arabic              | العربية           |
             | bg        | Bulgarian           | български         |
+            | bm        | Malay               | Bahasa Melayu     |
             | ca        | Catalan             | català            |
             | cs        | Czech               | Česky             |
             | cy-GB     | Welsh               | Cymraeg           |

data/lib/cucumber.rb

@@ -8,6 +8,7 @@ require 'cucumber/step_mother'
 require 'cucumber/cli/main'
 require 'cucumber/broadcaster'
 require 'cucumber/step_definitions'
+require 'cucumber/term/ansicolor'
 
 module Cucumber
   class << self
@@ -24,4 +25,4 @@ module Cucumber
       @log = logger
     end
   end
-end
+end

data/lib/cucumber/ast/step.rb

@@ -50,7 +50,7 @@ module Cucumber
       end
       
       def visit_step_result(visitor, step_match, multiline_arg, status, exception, background)
-        visitor.visit_step_result(@keyword, step_match, @multiline_arg, status, exception, source_indent, background)
+        visitor.visit_step_result(@keyword, step_match, @multiline_arg, status, exception, source_indent, background, file_colon_line)
       end
 
       def first_match(visitor)

data/lib/cucumber/ast/step_invocation.rb

@@ -47,7 +47,8 @@ module Cucumber
           @status,
           @reported_exception,
           source_indent,
-          @background
+          @background,
+          file_colon_line
         )
       end
 
@@ -93,20 +94,6 @@ module Cucumber
       end
 
       def failed(configuration, e, clear_backtrace)
-        if Cucumber::JRUBY && e.class.name == 'NativeException'
-          # JRuby's NativeException ignores #set_backtrace.
-          # We're fixing it.
-          e.instance_eval do
-            def set_backtrace(backtrace)
-              @backtrace = backtrace
-            end
-
-            def backtrace
-              @backtrace
-            end
-          end
-        end
-
         e.set_backtrace([]) if e.backtrace.nil? || clear_backtrace
         e.backtrace << @step.backtrace_line unless @step.backtrace_line.nil?
         e = filter_backtrace(e)

data/lib/cucumber/ast/table.rb

@@ -285,7 +285,8 @@ module Cucumber
       # #diff!. You can use #map_column! on either of the tables.
       #
       # A Different error is raised if there are missing rows or columns, or
-      # surplus rows. An error is <em>not</em> raised for surplus columns.
+      # surplus rows. An error is <em>not</em> raised for surplus columns. An
+      # error is <em>not</em> raised for misplaced (out of sequence) columns.
       # Whether to raise or not raise can be changed by setting values in
       # +options+ to true or false:
       #
@@ -293,6 +294,7 @@ module Cucumber
       # * <tt>surplus_row</tt> : Raise on surplus rows (defaults to true)
       # * <tt>missing_col</tt> : Raise on missing columns (defaults to true)
       # * <tt>surplus_col</tt> : Raise on surplus columns (defaults to false)
+      # * <tt>misplaced_col</tt> : Raise on misplaced columns (defaults to false)
       #
       # The +other_table+ argument can be another Table, an Array of Array or
       # an Array of Hash (similar to the structure returned by #hashes).
@@ -301,7 +303,13 @@ module Cucumber
       # a Table argument, if you want to compare that table to some actual values. 
       #
       def diff!(other_table, options={})
-        options = {:missing_row => true, :surplus_row => true, :missing_col => true, :surplus_col => false}.merge(options)
+        options = {
+          :missing_row   => true,
+          :surplus_row   => true,
+          :missing_col   => true,
+          :surplus_col   => false,
+          :misplaced_col => false
+        }.merge(options)
 
         other_table = ensure_table(other_table)
         other_table.convert_headers!
@@ -317,6 +325,7 @@ module Cucumber
 
         missing_col = cell_matrix[0].detect{|cell| cell.status == :undefined}
         surplus_col = padded_width > original_width
+        misplaced_col = cell_matrix[0] != other_table.cell_matrix[0]
 
         require_diff_lcs
         cell_matrix.extend(Diff::LCS)
@@ -365,7 +374,8 @@ module Cucumber
           missing_row_pos && options[:missing_row] ||
           insert_row_pos  && options[:surplus_row] ||
           missing_col     && options[:missing_col] ||
-          surplus_col     && options[:surplus_col]
+          surplus_col     && options[:surplus_col] ||
+          misplaced_col   && options[:misplaced_col]
         raise Different.new(self) if should_raise
       end
 
@@ -437,13 +447,13 @@ module Cucumber
         options = {:color => true, :indent => 2, :prefixes => TO_S_PREFIXES}.merge(options)
         io = StringIO.new
 
-        c = Term::ANSIColor.coloring?
-        Term::ANSIColor.coloring = options[:color]
+        c = Cucumber::Term::ANSIColor.coloring?
+        Cucumber::Term::ANSIColor.coloring = options[:color]
         formatter = Formatter::Pretty.new(nil, io, options)
         formatter.instance_variable_set('@indent', options[:indent])
         TreeWalker.new(nil, [formatter]).visit_multiline_arg(self)
         
-        Term::ANSIColor.coloring = c
+        Cucumber::Term::ANSIColor.coloring = c
         io.rewind
         s = "\n" + io.read + (" " * (options[:indent] - 2))
         s