cucumber 0.3.91 → 0.3.92

data/History.txt

@@ -1,3 +1,21 @@
+== (In Git)
+
+This release has some minor improvements to the new Table.diff! functionality. For example,
+if you're using Webrat and you want to compare a feature table with a HTML table containing
+links in one of the columns, you can do:
+
+  actual = Cucumber::Ast::Table.new(table_at('table').to_a)
+  actual.map_column!('Name') { |text| text.strip.match(/>(.*)</)[1] }
+  table.diff!(actual)
+
+=== New features
+* Allow Step Definitions to accept mix of required & optional args (Niels Ganser)
+* table_a.diff!(table_b) now uses column conversions from both tables (Table#map_column!) (Aslak Hellesøy)
+
+=== Bugfixes
+* Upgrade Sinatra example to work with rack-test 0.3.0 and aslakhellesoy-webrat 0.4.4.1 (Aslak Hellesøy)
+* require 'cucumber/webrat/table_locator' added to Spork environment for Rails (Anders Furseth)
+
 == 0.3.91 2009-07-27
 
 === New Features

data/config/hoe.rb

@@ -48,7 +48,8 @@ end
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
+$hoe = Hoe.spec(GEM_NAME) do |p|
+  p.version = VERS
   p.developer(AUTHOR, EMAIL)
   p.description = DESCRIPTION
   p.summary = DESCRIPTION
@@ -61,7 +62,7 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   p.extra_deps = [ 
     ['term-ansicolor', '>= 1.0.3'], 
-    ['treetop', '>= 1.2.6'], 
+    ['treetop', '>= 1.3.0'], 
     ['diff-lcs', '>= 1.1.2'],
     ['builder', '>= 2.1.2']
   ]

data/examples/sinatra/features/support/env.rb

@@ -1,6 +1,10 @@
 # See http://wiki.github.com/aslakhellesoy/cucumber/sinatra
 # for more details about Sinatra with Cucumber
 
+gem 'rack-test', '=0.3.0'
+gem 'aslakhellesoy-webrat', '=0.4.4.1'
+gem 'sinatra', '=0.9.4'
+
 # Sinatra
 app_file = File.join(File.dirname(__FILE__), *%w[.. .. app.rb])
 require app_file
@@ -8,13 +12,15 @@ require app_file
 Sinatra::Application.app_file = app_file
 
 require 'spec/expectations'
-
+require 'rack/test'
 require 'webrat'
+
 Webrat.configure do |config|
   config.mode = :rack
 end
 
 class MyWorld
+  include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers
 

data/features/html_formatter/a.html

@@ -166,7 +166,7 @@ which goes on and on and on for three lines
 yawn</span></h4><table><tr id="row_26"><th class="val skipped_param" id="row_26_0">state</th></tr><tr id="row_27"><td class="val passed" id="row_27_0">passing</td></tr></table></div></div></div><div class="feature"><h2><span class="val">Feature: Outline Sample</span></h2><p class="narrative"></p><div class="scenario"><h3><span class="keyword">Scenario:</span> <span class="val">I have no steps</span></h3><ol></ol></div><div class="scenario outline"><h3><span class="keyword">Scenario Outline:</span> <span class="val">Test state</span></h3><ol><li class="step skipped" id="features_outline_sample_feature_6"><div><span class="keyword">Given</span> <span class="step val">&lt;state&gt; without a table</span></div></li><li class="step skipped" id="features_outline_sample_feature_7"><div><span class="keyword">Given</span> <span class="step val">&lt;other_state&gt; without a table</span></div></li></ol><div class="examples"><h4><span class="keyword">Examples:</span> <span class="val">Rainbow colours</span></h4><table><tr id="row_9"><th class="val skipped_param" id="row_9_0">state</th><th class="val skipped_param" id="row_9_1">other_state</th></tr><tr id="row_10"><td class="val undefined" id="row_10_0">missing</td><td class="val skipped" id="row_10_1">passing</td></tr><tr id="row_11"><td class="val passed" id="row_11_0">passing</td><td class="val passed" id="row_11_1">passing</td></tr><tr id="row_12"><td class="val failed" id="row_12_0">failing</td><td class="val skipped" id="row_12_1">passing</td></tr><tr><td class="failed" colspan="2"><pre>FAIL (RuntimeError)
 ./features/step_definitions/sample_steps.rb:2:in `flunker'
 ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-features/outline_sample.feature:6:in `Given <state> without a table'</pre></td></tr></table></div><div class="examples"><h4><span class="keyword">Examples:</span> <span class="val">Only passing</span></h4><table><tr id="row_14"><th class="val skipped_param" id="row_14_0">state</th><th class="val skipped_param" id="row_14_1">other_state</th></tr><tr id="row_15"><td class="val passed" id="row_15_0">passing</td><td class="val passed" id="row_15_1">passing</td></tr></table></div></div></div><div class="feature"><pre class="comment"># Feature comment<br/></pre><span class="tag">@one</span><h2><span class="val">Feature: Sample</span></h2><p class="narrative"></p><div class="scenario"><span class="tag">@two</span><span class="tag">@three</span><h3><span class="keyword">Scenario:</span> <span class="val">Missing</span></h3><ol><li class="step undefined" id="features_sample_feature_7"><div><span class="keyword">Given</span> <span class="step val">missing</span></div></li></ol></div><div class="scenario"><pre class="comment"># Scenario comment<br/></pre><span class="tag">@three</span><h3><span class="keyword">Scenario:</span> <span class="val">Passing</span></h3><ol><li class="step passed" id="features_sample_feature_12"><div><span class="keyword">Given</span> <span class="step val">passing</span></div><table><tr id="row_13"><td class="val" id="row_13_0">a</td><td class="val" id="row_13_1">b</td></tr><tr id="row_14"><td class="val" id="row_14_0">c</td><td class="val" id="row_14_1">d</td></tr></table></li></ol></div><div class="scenario"><span class="tag">@four</span><h3><span class="keyword">Scenario:</span> <span class="val">Failing</span></h3><ol><li class="step failed" id="features_sample_feature_18"><div><span class="keyword">Given</span> <span class="step val">failing</span></div><pre class="val">hello</pre><pre class="failed">FAIL (RuntimeError)
+features/outline_sample.feature:6:in `Given <state> without a table'</pre></td></tr></table></div><div class="examples"><h4><span class="keyword">Examples:</span> <span class="val">Only passing</span></h4><table><tr id="row_14"><th class="val skipped_param" id="row_14_0">state</th><th class="val skipped_param" id="row_14_1">other_state</th></tr><tr id="row_15"><td class="val passed" id="row_15_0">passing</td><td class="val passed" id="row_15_1">passing</td></tr></table></div></div></div><div class="feature"><pre class="comment"># Feature comment<br/></pre><span class="tag">@one</span><h2><span class="val">Feature: Sample</span></h2><p class="narrative"></p><div class="scenario"><span class="tag">@two</span> <span class="tag">@three</span><h3><span class="keyword">Scenario:</span> <span class="val">Missing</span></h3><ol><li class="step undefined" id="features_sample_feature_7"><div><span class="keyword">Given</span> <span class="step val">missing</span></div></li></ol></div><div class="scenario"><pre class="comment"># Scenario comment<br/></pre><span class="tag">@three</span><h3><span class="keyword">Scenario:</span> <span class="val">Passing</span></h3><ol><li class="step passed" id="features_sample_feature_12"><div><span class="keyword">Given</span> <span class="step val">passing</span></div><table><tr id="row_13"><td class="val" id="row_13_0">a</td><td class="val" id="row_13_1">b</td></tr><tr id="row_14"><td class="val" id="row_14_0">c</td><td class="val" id="row_14_1">d</td></tr></table></li></ol></div><div class="scenario"><span class="tag">@four</span><h3><span class="keyword">Scenario:</span> <span class="val">Failing</span></h3><ol><li class="step failed" id="features_sample_feature_18"><div><span class="keyword">Given</span> <span class="step val">failing</span></div><pre class="val">hello</pre><pre class="failed">FAIL (RuntimeError)
 ./features/step_definitions/sample_steps.rb:2:in `flunker'
 ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
 features/sample.feature:18:in `Given failing'</pre></li></ol></div></div><div class="feature"><h2><span class="val">Feature: search examples</span></h2><p class="narrative"></p><div class="background"><h3><span class="keyword">Background:</span> <span class="val">Hantu Pisang background match</span></h3><ol><li class="step passed" id="features_search_sample_feature_4"><div><span class="keyword">Given</span> <span class="step val">passing without a table</span></div></li></ol></div><div class="scenario"><h3><span class="keyword">Scenario:</span> <span class="val">should match Hantu Pisang</span></h3><ol><li class="step passed" id="features_search_sample_feature_7"><div><span class="keyword">Given</span> <span class="step val">passing without a table</span></div></li></ol></div><div class="scenario"><h3><span class="keyword">Scenario:</span> <span class="val">Ignore me</span></h3><ol><li class="step failed" id="features_search_sample_feature_10"><div><span class="keyword">Given</span> <span class="step val">failing without a table</span></div><pre class="failed">FAIL (RuntimeError)

data/lib/cucumber/ast/feature.rb

@@ -44,6 +44,15 @@ module Cucumber
         "#{@file}:#{line}"
       end
 
+      def short_name
+        first_line = name.split(/\n/)[0]
+        if first_line =~ /#{language.keywords('feature', true)}:(.*)/
+          $1.strip
+        else
+          first_line
+        end
+      end
+
       def to_sexp
         sexp = [:feature, @file, @name]
         comment = @comment.to_sexp

data/lib/cucumber/ast/features.rb

@@ -9,6 +9,10 @@ module Cucumber
         @features = []
       end
 
+      def [](index)
+        @features[index]
+      end
+
       def each(&proc)
         @features.each(&proc)
       end

data/lib/cucumber/ast/table.rb

@@ -190,7 +190,7 @@ module Cucumber
       #
       # Since all tables that are passed to StepDefinitions always have String
       # objects in their cells, you may want to use #map_column! before calling
-      # #diff!
+      # #diff!. You can use #map_column! on either of the tables.
       #
       # An exception is raised if there are missing rows or columns, or
       # surplus rows. An error is <em>not</em> raised for surplus columns.
@@ -212,6 +212,7 @@ module Cucumber
         options = {:missing_row => true, :surplus_row => true, :missing_col => true, :surplus_col => false}.merge(options)
 
         other_table = ensure_table(other_table)
+        other_table.convert_columns!
         ensure_green!
 
         original_width = cell_matrix[0].length

data/lib/cucumber/cli/main.rb

@@ -137,6 +137,12 @@ module Cucumber
       def trap_interrupt
         trap('INT') do
           $cucumber_interrupted = true
+          STDERR.puts "Interrupted. Waiting for current step to finish."
+          STDERR.puts "Will suicide in 5 seconds if current step doesn't finish gracefully."
+          Thread.new do
+            sleep(5)
+            exit!(1)
+          end
         end
       end
     end

data/lib/cucumber/core_ext/instance_exec.rb

@@ -10,10 +10,12 @@ class Object
     cucumber_run_with_backtrace_filtering(pseudo_method) do
       if check_arity && !cucumber_compatible_arity?(args, block)
         instance_exec do
-          s1 = cucumber_arity(block) == 1 ? "" : "s"
+          ari = cucumber_arity(block)
+          ari = ari < 0 ? (ari.abs-1).to_s+"+" : ari
+          s1 = ari == 1 ? "" : "s"
           s2 = args.length == 1 ? "" : "s"
           raise Cucumber::ArityMismatchError.new(
-            "Your block takes #{cucumber_arity(block)} argument#{s1}, but the Regexp matched #{args.length} argument#{s2}."
+            "Your block takes #{ari} argument#{s1}, but the Regexp matched #{args.length} argument#{s2}."
           )
         end
       else
@@ -28,9 +30,10 @@ class Object
   end
   
   def cucumber_compatible_arity?(args, block)
-    a = cucumber_arity(block)
-    return true if (a == -1) && Cucumber::RUBY_1_9
-    a == args.length
+    ari = cucumber_arity(block)
+    len = args.length
+    return true if ari == len or ari < 0 && len >= ari.abs-1
+    false
   end
   
   def cucumber_run_with_backtrace_filtering(pseudo_method)

data/lib/cucumber/languages.yml

@@ -168,13 +168,13 @@
   feature: Feature
   background: Background
   scenario: Scenario
-  scenario_outline: All y'all
+  scenario_outline: All y\'all
   examples: Examples
-  given: Given y'all
-  when: When y'all
-  then: Then y'all
-  and: And y'all
-  but: But y'all
+  given: Given y\'all
+  when: When y\'all
+  then: Then y\'all
+  and: And y\'all
+  but: But y\'all
   space_after_keyword: true
 "es":
   name: Spanish

data/lib/cucumber/step_definition.rb

@@ -86,7 +86,7 @@ module Cucumber
 
     include StepDefinitionMethods
 
-    attr_reader :regexp, :proc
+    attr_reader :proc
 
     def initialize(pattern, &proc)
       raise MissingProc if proc.nil?

data/lib/cucumber/version.rb

@@ -2,7 +2,7 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 91
+    TINY  = 92
     PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')

data/rails_generators/cucumber/templates/spork_env.rb

@@ -7,6 +7,7 @@ Spork.prefork do
   require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
  
   require 'webrat'
+  require 'cucumber/webrat/table_locator' # Lets you do table.diff!(table_at('#my_table').to_a)
  
   Webrat.configure do |config|
     config.mode = :rails

data/spec/cucumber/ast/table_spec.rb

@@ -227,7 +227,7 @@ module Cucumber
           }
         end
 
-        it "should allow column mapping before diffing" do
+        it "should allow column mapping of target before diffing" do
           t1 = Table.new([
             ['name',  'male'],
             ['aslak', 'true']
@@ -244,6 +244,25 @@ module Cucumber
           }
         end
 
+        it "should allow column mapping of argument before diffing" do
+          t1 = Table.new([
+            ['name',  'male'],
+            ['aslak', true]
+          ])
+          t1.map_column!('male') { 
+            'true'
+          }
+          t2 = Table.new([
+            ['name',  'male'],
+            ['aslak', 'true']
+          ])
+          t2.diff!(t1)
+          t1.to_s(:indent => 12, :color => false).should == %{
+            |     name  |     male |
+            |     aslak |     true |
+          }
+        end
+
         it "should allow header mapping before diffing" do
           t1 = Table.new([
             ['Name',  'Male'],

data/spec/cucumber/core_ext/proc_spec.rb

@@ -36,7 +36,7 @@ describe Proc do
   end
 
   if Cucumber::RUBY_1_9
-    it "should allow varargs" do
+    it "should allow varargs (expecting 0+)" do
       lambda {
         Object.new.cucumber_instance_exec(true, 'foo', 1) do |*args|
         end
@@ -44,11 +44,25 @@ describe Proc do
     end
   else
     # Ruby 1.8
-    it "should not allow varargs because Ruby 1.8 reports same arity as with no args, so we can't really tell the difference." do
+    it "should not allow varargs 0+ because Ruby 1.8 reports same arity as with no args, so we can't really tell the difference." do
       lambda {
         Object.new.cucumber_instance_exec(true, 'foo', 1) do |*args|
         end
       }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 0 arguments, but the Regexp matched 1 argument.")
     end
   end
+
+  it "should allow varargs (expecting 1+)" do
+    lambda {
+      Object.new.cucumber_instance_exec(true, 'foo', 1) do |arg,*args|
+      end
+    }.should_not raise_error(Cucumber::ArityMismatchError)
+  end
+
+  it "should raise ArityMismatchError for too few required args when using varargs (expecting 1+)" do
+    lambda {
+      Object.new.cucumber_instance_exec(true, nil) do |arg,*args|
+      end
+    }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 1+ arguments, but the Regexp matched 0 arguments.")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.91
+  version: 0.3.92
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 +02:00
+date: 2009-07-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.6
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs