cucumber 1.2.1 → 1.2.2

data/lib/cucumber/wire_support/wire_step_definition.rb

@@ -2,25 +2,25 @@ module Cucumber
   module WireSupport
     class WireStepDefinition
       attr_reader :regexp_source, :file_colon_line
-      
+
       def initialize(connection, data)
         @connection = connection
         @id              = data['id']
         @regexp_source   = data['regexp'] || "Unknown"
         @file_colon_line = data['source'] || "Unknown"
       end
-      
+
       def invoke(args)
         prepared_args = args.map{ |arg| prepare(arg) }
         @connection.invoke(@id, prepared_args)
       end
 
       private
-      
+
       def prepare(arg)
         return arg unless arg.is_a?(Cucumber::Ast::Table)
         arg.raw
       end
     end
   end
-end
+end

data/spec/cucumber/ast/background_spec.rb

@@ -28,7 +28,7 @@ module Cucumber
         background = Background.new(
           comment=Comment.new(''),
           line=2,
-          keyword="", 
+          keyword="",
           title="",
           description="",
           steps=[
@@ -37,10 +37,10 @@ module Cucumber
 
         scenario = Scenario.new(
           background,
-          comment=Comment.new(""), 
+          comment=Comment.new(""),
           tags=Tags.new(98,[]),
           line=99,
-          keyword="", 
+          keyword="",
           title="",
           description="",
           steps=[]
@@ -110,6 +110,6 @@ module Cucumber
 
       end
     end
-    
+
   end
 end

data/spec/cucumber/ast/doc_string_spec.rb

@@ -9,23 +9,23 @@ module Cucumber
         before(:each) do
           @ps = DocString.new("<book>\n<qty>\n", '')
         end
-      
+
         it "should return a new doc_string with arguments replaced with values" do
           doc_string_with_replaced_arg = @ps.arguments_replaced({'<book>' => 'Life is elsewhere', '<qty>' => '5'})
-                
+
           doc_string_with_replaced_arg.to_step_definition_arg.should == "Life is elsewhere\n5\n"
         end
-        
+
         it "should not change the original doc_string" do
           doc_string_with_replaced_arg = @ps.arguments_replaced({'<book>' => 'Life is elsewhere'})
-          
+
           @ps.to_s.should_not include("Life is elsewhere")
         end
 
         it "should replaced nil with empty string" do
           ps = DocString.new("'<book>'", '')
-          doc_string_with_replaced_arg = ps.arguments_replaced({'<book>' => nil}) 
-          
+          doc_string_with_replaced_arg = ps.arguments_replaced({'<book>' => nil})
+
           doc_string_with_replaced_arg.to_step_definition_arg.should == "''"
         end
 
@@ -34,7 +34,7 @@ module Cucumber
         end
 
       end
-      
+
     end
   end
-end
+end

data/spec/cucumber/ast/feature_factory.rb

@@ -10,7 +10,7 @@ module Cucumber
           raise "I flunked"
         end
       end
-      
+
       def create_feature(dsl)
         dsl.Given /^a (.*) step with an inline arg:$/ do |what, table|
         end
@@ -26,13 +26,13 @@ module Cucumber
           %w{4444 55555 666666}
         ])
         doc_string = Ast::DocString.new(%{\n I like\nCucumber sandwich\n}, '')
-        
+
         background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:", "", "",
           [
             Step.new(3, "Given", "a passing step")
           ]
         )
-        
+
         f = Ast::Feature.new(
           background,
           Ast::Comment.new("# My feature comment\n"),
@@ -59,4 +59,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/spec/cucumber/ast/feature_spec.rb

@@ -9,7 +9,7 @@ module Cucumber
       it "should convert to sexp" do
         step_mother = Cucumber::Runtime.new
         step_mother.load_programming_language('rb')
-        dsl = Object.new 
+        dsl = Object.new
         dsl.extend Cucumber::RbSupport::RbDsl
 
         feature = create_feature(dsl)
@@ -18,36 +18,36 @@ module Cucumber
         else
           feature_file_path = "features/pretty_printing.feature"
         end
-        feature.to_sexp.should == 
+        feature.to_sexp.should ==
         [:feature,
           feature_file_path,
-          "Pretty printing", 
-          [:comment, "# My feature comment\n"], 
-          [:tag, "one"], 
-          [:tag, "two"], 
+          "Pretty printing",
+          [:comment, "# My feature comment\n"],
+          [:tag, "one"],
+          [:tag, "two"],
           [:background, 2, 'Background:',
             [:step, 3, "Given", "a passing step"]],
-          [:scenario, 9, "Scenario:", 
-            "A Scenario", 
-            [:comment, "    # My scenario comment  \n# On two lines \n"], 
-            [:tag, "three"], 
+          [:scenario, 9, "Scenario:",
+            "A Scenario",
+            [:comment, "    # My scenario comment  \n# On two lines \n"],
+            [:tag, "three"],
             [:tag, "four"],
             [:step_invocation, 3, "Given", "a passing step"], # From the background
             [:step_invocation, 10, "Given", "a passing step with an inline arg:",
-              [:table, 
+              [:table,
                 [:row, -1,
-                  [:cell, "1"], [:cell, "22"], [:cell, "333"]], 
+                  [:cell, "1"], [:cell, "22"], [:cell, "333"]],
                 [:row, -1,
-                  [:cell, "4444"], [:cell, "55555"], [:cell, "666666"]]]], 
-            [:step_invocation, 11, "Given", "a happy step with an inline arg:", 
-              [:doc_string, "\n I like\nCucumber sandwich\n"]], 
-            [:step_invocation, 12, "Given", "a failing step"]]]          
+                  [:cell, "4444"], [:cell, "55555"], [:cell, "666666"]]]],
+            [:step_invocation, 11, "Given", "a happy step with an inline arg:",
+              [:doc_string, "\n I like\nCucumber sandwich\n"]],
+            [:step_invocation, 12, "Given", "a failing step"]]]
       end
 
       it "should store OS specific file paths" do
         step_mother = Cucumber::Runtime.new
         step_mother.load_programming_language('rb')
-        dsl = Object.new 
+        dsl = Object.new
         dsl.extend Cucumber::RbSupport::RbDsl
         feature = create_feature(dsl)
 
@@ -55,7 +55,7 @@ module Cucumber
           feature.file.should == 'features\pretty_printing.feature'
         else
           feature.file.should == 'features/pretty_printing.feature'
-        end                
+        end
       end
 
     end

data/spec/cucumber/ast/outline_table_spec.rb

@@ -6,11 +6,11 @@ module Cucumber::Ast
       describe "a header row" do
         before(:each) do
           @row = OutlineTable::ExampleRow.new(
-            mock('table', :index => 0), 
+            mock('table', :index => 0),
             [mock('cell', :status= => nil)]
           )
         end
-        
+
         it "should raise an error if you try to call #failed?" do
           @row.accept_plain mock('visitor', :visit_table_cell => nil)
           lambda{ @row.failed? }.should raise_error(NoMethodError, /cannot pass or fail/)
@@ -18,4 +18,4 @@ module Cucumber::Ast
       end
     end
   end
-end
+end

data/spec/cucumber/ast/step_spec.rb

@@ -15,7 +15,7 @@ module Cucumber
         ])
         cells = invocation_table.cells_rows[1]
         step_invocation = step.step_invocation_from_cells(cells)
-        
+
         step_invocation.name.should == 'a green cucumber'
       end
 
@@ -28,7 +28,7 @@ module Cucumber
         ])
         cells = invocation_table.cells_rows[1]
         step_invocation = step.step_invocation_from_cells(cells)
-        
+
         step_invocation.name.should == 'a cucumber'
       end
 
@@ -43,7 +43,7 @@ module Cucumber
         ])
         cells = invocation_table.cells_rows[1]
         step_invocation = step.step_invocation_from_cells(cells)
-        
+
         step_invocation.instance_variable_get('@multiline_arg').raw.should == [%w{taste_juicy color_green}]
       end
 
@@ -58,7 +58,7 @@ module Cucumber
         ])
         cells = invocation_table.cells_rows[1]
         step_invocation = step.step_invocation_from_cells(cells)
-        
+
         step_invocation.instance_variable_get('@multiline_arg').to_step_definition_arg.should == 'taste_juicy color_green'
       end
     end

data/spec/cucumber/ast/table_spec.rb

@@ -54,7 +54,7 @@ module Cucumber
           @table.map_column!('one') { |v| v.to_i }
           @table.hashes.first['one'].should == 4444
         end
-
+        
         it "applies the block once to each value" do
           headers = ['header']
           rows = ['value']
@@ -102,7 +102,7 @@ module Cucumber
             %w{4444 55555 666666}
           ])
         end
-          
+
         it "returns nil if headers do not match" do
           @table.match('does,not,match').should be_nil
         end
@@ -121,14 +121,14 @@ module Cucumber
             %w{two 22222}
           ])
         end
-                
-        it "should be convertible in to an array where each row is a hash" do 
+
+        it "should be convertible in to an array where each row is a hash" do
           @table.transpose.hashes[0].should == {'one' => '1111', 'two' => '22222'}
         end
       end
-      
+
       describe "#rows_hash" do
-                
+
         it "should return a hash of the rows" do
           table = Table.new([
             %w{one 1111},
@@ -201,6 +201,33 @@ module Cucumber
           table.hashes.first.keys.should =~ %w[hello foo]
         end
 
+        it "should allow mapping of headers before table.hashes has been accessed" do
+          table = Table.new([
+          ['HELLO', 'WORLD'],
+          %w{4444 55555}
+          ])
+
+          table.map_headers! do |header|
+            header.downcase
+          end
+
+          table.hashes.first.keys.should =~ %w[hello world]
+        end
+
+        it "should allow mapping of headers after table.hashes has been accessed" do
+          table = Table.new([
+          ['HELLO', 'WORLD'],
+          %w{4444 55555}
+          ])
+
+          dev_null = table.hashes.size
+
+          table.map_headers! do |header|
+            header.downcase
+          end
+
+          table.hashes.first.keys.should =~ %w[hello world]
+        end
       end
 
       describe "replacing arguments" do
@@ -243,7 +270,7 @@ module Cucumber
                               %w{cat}
                             ])
           table_with_replaced_args = table.arguments_replaced({'<book>' => nil})
-          
+
           table_with_replaced_args.hashes[0]['book'].should == 'cat'
         end
 
@@ -258,13 +285,13 @@ module Cucumber
                               ['book', 'qty'],
                               ['<book>', nil],
                             ])
-          lambda{ 
+          lambda{
             table.arguments_replaced({'<book>' => nil, '<qty>' => '5'})
           }.should_not raise_error
         end
 
       end
-      
+
       describe "diff!" do
         it "should detect a complex diff" do
           t1 = table(%{
@@ -273,11 +300,11 @@ module Cucumber
             | 999999999 | 0000000000  | 01010101010 | 121212121212 |
             | 4000      | ABC         | DEF         | 50000        |
           }, __FILE__, __LINE__)
-          
+
           t2 = table(%{
-            | a     | 4444     | 1         | 
-            | bb    | 88888888 | 55555     | 
-            | ccc   | xxxxxxxx | 999999999 | 
+            | a     | 4444     | 1         |
+            | bb    | 88888888 | 55555     |
+            | ccc   | xxxxxxxx | 999999999 |
             | dddd  | 4000     | 300       |
             | e     | 50000    | 4000      |
           }, __FILE__, __LINE__)
@@ -346,7 +373,7 @@ module Cucumber
             ['name',  'male'],
             ['aslak', true]
           ])
-          t1.map_column!('male') { 
+          t1.map_column!('male') {
             'true'
           }
           t2 = Table.new([
@@ -405,7 +432,7 @@ module Cucumber
             t1.hashes
           end.should raise_error(%{2 headers matched /uk/: ["Cuke", "Duke"]})
         end
-        
+
         describe "raising" do
           before do
             @t = table(%{
@@ -414,7 +441,7 @@ module Cucumber
             }, __FILE__, __LINE__)
             @t.should_not == nil
           end
-          
+
           it "should raise on missing rows" do
             t = table(%{
               | a | b |
@@ -448,13 +475,7 @@ module Cucumber
             }, __FILE__, __LINE__)
             lambda { t1.dup.diff!(t2) }.should raise_error
 
-            begin
-              pending "http://groups.google.com/group/cukes/browse_thread/thread/5d96431c8245f05f" do
-                lambda { t1.dup.diff!(t2, :surplus_row => false) }.should_not raise_error
-              end
-            rescue => e
-              warn(e.message + " - see http://www.ruby-forum.com/topic/208508")
-            end
+            lambda { t1.dup.diff!(t2, :surplus_row => false) }.should_not raise_error
           end
 
           it "should raise on missing columns" do
@@ -494,22 +515,22 @@ module Cucumber
         it "should allow Array of Hash" do
           t1 = Table.new([{'name' => 'aslak', 'male' => 'true'}])
           t1.to_s(:indent => 12, :color => false).should == %{
-            |     name  |     male |
-            |     aslak |     true |
+            |     male |     name  |
+            |     true |     aslak |
           }
         end
       end
 
       it "should convert to sexp" do
-        @table.to_sexp.should == 
-          [:table, 
+        @table.to_sexp.should ==
+          [:table,
             [:row, -1,
-              [:cell, "one"], 
+              [:cell, "one"],
               [:cell, "four"],
               [:cell, "seven"]
             ],
             [:row, -1,
-              [:cell, "4444"], 
+              [:cell, "4444"],
               [:cell, "55555"],
               [:cell, "666666"]]]
       end

data/spec/cucumber/ast/tree_walker_spec.rb

@@ -2,10 +2,18 @@ require 'spec_helper'
 
 module Cucumber::Ast
   describe TreeWalker do
+    let(:tree_walker) do
+      TreeWalker.new(nil, [mock('listener', :before_visit_features => nil)])
+    end
+    let(:features) { mock('features', :accept => nil) }
+
     it "should visit features" do
-      tw = TreeWalker.new(nil, [mock('listener', :before_visit_features => nil)])
-      tw.should_not_receive(:warn)
-      tw.visit_features(mock('features', :accept => nil))
+      tree_walker.should_not_receive(:warn)
+      tree_walker.visit_features(features)
+    end
+
+    it "should return self" do
+      tree_walker.visit_features(features).should == tree_walker
     end
   end
-end
+end