kosmas58-cucumber 0.1.99.23 → 0.1.100.5

data/spec/cucumber/ast/step_collection_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Cucumber
+  module Ast
+    describe StepCollection do
+    end
+  end
+end

data/spec/cucumber/ast/step_spec.rb

@@ -5,40 +5,61 @@ require 'cucumber/core_ext/string'
 
 module Cucumber
   module Ast
-    describe StepMother do
-      it "should calculate comment padding" do
-        scenario = Scenario.new(comment=nil, tags=nil, line=nil, keyword='Given', name='Gazpacho', steps=[
-          Step.new(22, "Given", "tøtal 13"),
-          Step.new(23, "And",   "the total 15")
+    describe Step do
+      it "should replace arguments in name" do
+        step = Step.new(1, 'Given', 'a <color> cucumber')
+
+        invocation_table = Table.new([
+          %w{color taste},
+          %w{green juicy}
         ])
-        step1, step2 = *scenario.instance_variable_get('@steps')
+        cells = invocation_table.cells_rows[1]
+        step_invocation = step.step_invocation_from_cells(cells)
+        
+        step_invocation.name.should == 'a green cucumber'
+      end
+
+      it "should use empty string for the replacement of arguments in name when replace value is nil" do
+        step = Step.new(1, 'Given', 'a <color>cucumber')
 
-        step1.source_indent.should == 2
-        step2.source_indent.should == 0
+        invocation_table = Table.new([
+          ['color'],
+          [nil]
+        ])
+        cells = invocation_table.cells_rows[1]
+        step_invocation = step.step_invocation_from_cells(cells)
+        
+        step_invocation.name.should == 'a cucumber'
       end
-    end
-    
-    describe Step do
-      describe "execute step with arguments" do
-      
-        it "should replace arguments in multiline args" do
-          mock_multiline_arg = mock('multiline arg')
-          step = Step.new(23, 'Given', '<test>', mock_multiline_arg)
 
-          mock_multiline_arg.should_receive(:arguments_replaced).with({'<test>' => '10'}).and_return(mock_multiline_arg)
+      it "should replace arguments in table arg" do
+        arg_table = Table.new([%w{taste_<taste> color_<color>}])
+
+        step = Step.new(1, 'Given', 'a <color> cucumber', arg_table)
+
+        invocation_table = Table.new([
+          %w{color taste},
+          %w{green juicy}
+        ])
+        cells = invocation_table.cells_rows[1]
+        step_invocation = step.step_invocation_from_cells(cells)
         
-          step.execute_with_arguments({'test' => '10'}, stub('world'), :passed, visitor=nil, line=-1)
-        end
-       
-        it "should invoke step with replaced multiline args" do
-          mock_step_definition = mock('step definition')
-          mock_multiline_arg_replaced = mock('multiline arg replaced')
-          mock_multiline_arg = mock('multiline arg', :arguments_replaced => mock_multiline_arg_replaced)
-          step = Step.new(45, 'Given', '<test>', mock_multiline_arg)
+        step_invocation.instance_variable_get('@multiline_arg').raw.should == [%w{taste_juicy color_green}]
+      end
+
+      it "should replace arguments in py string arg" do
+        py_string = PyString.new(1, 2, 'taste_<taste> color_<color>', 0)
+
+        step = Step.new(1, 'Given', 'a <color> cucumber', py_string)
+
+        invocation_table = Table.new([
+          %w{color taste},
+          %w{green juicy}
+        ])
+        cells = invocation_table.cells_rows[1]
+        step_invocation = step.step_invocation_from_cells(cells)
         
-          step.execute_with_arguments({'test' => '10'}, stub('world'), :passed, visitor=nil, line=-1)
-        end
-  
+        step_invocation.instance_variable_get('@multiline_arg').to_s.should == 'taste_juicy color_green'
       end
     end
   end

data/spec/cucumber/ast/table_spec.rb

@@ -103,6 +103,16 @@ module Cucumber
           table_with_replaced_args.hashes[0]['book'].should == nil
         end
 
+        it "should preserve values which don't match a placeholder when replacing with nil" do
+          table = Table.new([
+                              %w{book},
+                              %w{cat}
+                            ])
+          table_with_replaced_args = table.arguments_replaced({'<book>' => nil})
+          
+          table_with_replaced_args.hashes[0]['book'].should == 'cat'
+        end
+
         it "should not change the original table" do
           @table.arguments_replaced({'<book>' => 'Unbearable lightness of being'})
 
@@ -111,11 +121,11 @@ module Cucumber
 
         it "should not raise an error when there are nil values in the table" do
           table = Table.new([
-                              ['book'],
-                              [nil]
+                              ['book', 'qty'],
+                              ['<book>', nil],
                             ])
           lambda{ 
-            table.arguments_replaced({'<book>' => 'The great sheep chase'})
+            table.arguments_replaced({'<book>' => nil, '<qty>' => '5'})
           }.should_not raise_error
         end
 

data/spec/cucumber/ast/tags_spec.rb

@@ -8,27 +8,11 @@ module Cucumber
       end
 
       it "should be among other tags" do
-        @tags.should be_among(%w{one})
-      end
-
-      it "should be among other tags even with @ prefix" do
-        @tags.should be_among(%w{@one})
-      end
-
-      it "should not be among other tags" do
-        @tags.should_not be_among(%w{one ~two})
-      end
-
-      it "should not be among other tags with @ prefix" do
-        @tags.should_not be_among(%w{one ~@two})
-      end
-
-      it "should be among other tags with irrelevant negative tag" do
-        @tags.should be_among(%w{~bacon})
+        @tags.should have_tags(%w{one})
       end
 
       it "should not be among other tags with irrelevent tag" do
-        @tags.should_not be_among(%w{bacon})
+        @tags.should_not have_tags(%w{bacon})
       end
     end
   end

data/spec/cucumber/broadcaster_spec.rb

@@ -2,13 +2,14 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 module Cucumber
   describe Broadcaster do
+    before do
+      @receiver = mock('receiver')
+      @broadcaster = Broadcaster.new([@receiver])
+    end
     
     it "should broadcast methods to registered objects" do
-      receiver = mock('receiver')
-      broadcaster = Broadcaster.new([receiver])
-
-      receiver.should_receive(:konbanwa).with('good evening')
-      broadcaster.konbanwa('good evening')
+      @receiver.should_receive(:konbanwa).with('good evening')
+      @broadcaster.konbanwa('good evening')
     end
   end
 end

data/spec/cucumber/cli/configuration_spec.rb

@@ -201,6 +201,13 @@ END_OF_MESSAGE
       config.parse!(['--no-color'])
     end
     
+    it "should parse tags" do
+      config = Configuration.new(nil)
+      includes, excludes = config.parse_tags("one,~two,@three,~@four")
+      includes.should == ['one', 'three']
+      excludes.should == ['two', 'four']
+    end
+    
     describe "--backtrace" do
       before do
         Exception.cucumber_full_backtrace = false

data/spec/cucumber/cli/main_spec.rb

@@ -26,7 +26,7 @@ module Cli
     describe "verbose mode" do
       
       before(:each) do
-        @empty_feature = Ast::Feature.new(Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
+        @empty_feature = Ast::Feature.new(nil, Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
         Dir.stub!(:[])
       end
 

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -94,14 +94,15 @@ Feature: hi
     Given Pepper
 
 @st3 
-   @st4 @ST5 @#^%&ST6**!
+   @st4    @ST5  @#^%&ST6**!
   Scenario: Second}).to_sexp.should ==
           [:feature, "Feature: hi",
             [:comment, "# FC\n  "],
             [:tag, "ft"],
             [:scenario, 6, 'Scenario:', 'First',
               [:tag, "st1"], [:tag, "st2"],
-              [:step, 7, "Given", "Pepper"]],
+              [:step_invocation, 7, "Given", "Pepper"]
+            ],
             [:scenario, 11, 'Scenario:', 'Second',
               [:tag, "st3"], [:tag, "st4"], [:tag, "ST5"], [:tag, "#^%&ST6**!"]]]
         end
@@ -135,7 +136,7 @@ Scenario: bar
           parse("Feature: Hi\nScenario: Hello\nGiven I am a step\n").to_sexp.should ==
           [:feature, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
-              [:step, 3, "Given", "I am a step"]]]
+              [:step_invocation, 3, "Given", "I am a step"]]]
         end
 
         it "should have steps with inline table" do
@@ -146,7 +147,7 @@ Given I have a table
 }).to_sexp.should ==
           [:feature, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
-              [:step, 3, "Given", "I have a table",
+              [:step_invocation, 3, "Given", "I have a table",
                 [:table,
                   [:row,
                     [:cell, "a"],
@@ -167,7 +168,7 @@ Given I have a string
 }).to_sexp.should ==
           [:feature, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
-              [:step, 3, "Given", "I have a string",
+              [:step_invocation, 3, "Given", "I have a string",
                 [:py_string, "hello\nworld"]]]]
         end
       end

data/spec/cucumber/step_definition_spec.rb

@@ -8,7 +8,7 @@ module Cucumber
   describe StepDefinition do
     before do
       extend StepMother
-      @world = new_world
+      @world = new_world!
       $inside = nil
     end
 
@@ -20,7 +20,7 @@ module Cucumber
         $inside = true
       end
 
-      step_definition("Outside").execute(nil, @world)
+      step_match("Outside").invoke(@world, nil)
       $inside.should == true
     end
 
@@ -32,7 +32,7 @@ module Cucumber
         $inside = table.raw[0][0]
       end
 
-      step_definition("Outside").execute(nil, @world)
+      step_match("Outside").invoke(@world, nil)
       $inside.should == 'inside'
     end
 
@@ -45,7 +45,7 @@ module Cucumber
       step.should_receive(:exception=)
       lambda do
         @world.__cucumber_current_step = step
-        step_definition('Outside').execute(nil, @world)
+        step_match('Outside').invoke(@world, nil)
       end.should raise_error(Undefined, 'Undefined step: "Inside"')
     end
 
@@ -55,7 +55,7 @@ module Cucumber
       end
 
       lambda do
-        step_definition("Outside").execute(nil, @world)
+        step_match("Outside").invoke(@world, nil)
       end.should raise_error(Pending, "Do me!")
     end
     
@@ -66,5 +66,16 @@ module Cucumber
       stepdef.to_s.should    == '/Hello (.*)/ # spec/cucumber/step_definition_spec.rb:63'
       stepdef.to_s(2).should == '/Hello (.*)/   # spec/cucumber/step_definition_spec.rb:63'
     end
+    
+    it "should allow announce" do
+      v = mock('visitor')
+      v.should_receive(:announce).with('wasup')
+      self.visitor = v
+      world = new_world!
+      Given /Loud/ do
+        announce 'wasup'
+      end
+      step_match("Loud").invoke(world, nil)
+    end
   end
 end

data/spec/cucumber/step_mother_spec.rb

@@ -15,7 +15,7 @@ module Cucumber
       end
       @step_mother.Given(/nope something else/) do |what, month|
       end
-      format = @step_mother.step_definition("it snows in april").format_args("it snows in april", "[%s]")
+      format = @step_mother.step_match("it snows in april").format_args("[%s]")
       format.should == "it [snows] in [april]"
     end
 
@@ -24,7 +24,7 @@ module Cucumber
       @step_mother.Given(/Three blind (.*)/) {|animal|}
 
       lambda do
-        @step_mother.step_definition("Three blind mice")
+        @step_mother.step_match("Three blind mice")
       end.should raise_error(Ambiguous, %{Ambiguous match of "Three blind mice":
 
 spec/cucumber/step_mother_spec.rb:23:in `/Three (.*) mice/'
@@ -39,7 +39,7 @@ spec/cucumber/step_mother_spec.rb:24:in `/Three blind (.*)/'
       @step_mother.Given(/Three (.*)/) {|animal|}
 
       lambda do
-        @step_mother.step_definition("Three blind mice")
+        @step_mother.step_match("Three blind mice")
       end.should_not raise_error
     end
     
@@ -47,19 +47,19 @@ spec/cucumber/step_mother_spec.rb:24:in `/Three blind (.*)/'
       @step_mother.options = {:guess => true}
       right = @step_mother.Given(/Three (.*) mice/) {|disability|}
       wrong = @step_mother.Given(/Three (.*)/) {|animal|}
-      @step_mother.step_definition("Three blind mice").should == right
+      @step_mother.step_match("Three blind mice").step_definition.should == right
     end
     
     it "should pick right step definition when --guess is enabled and unequal number of capture groups" do
       @step_mother.options = {:guess => true}
       right = @step_mother.Given(/Three (.*) mice ran (.*)/) {|disability|}
       wrong = @step_mother.Given(/Three (.*)/) {|animal|}
-      @step_mother.step_definition("Three blind mice ran far").should == right
+      @step_mother.step_match("Three blind mice ran far").step_definition.should == right
     end
     
     it "should raise Undefined error when no step definitions match" do
       lambda do
-        @step_mother.step_definition("Three blind mice")
+        @step_mother.step_match("Three blind mice")
       end.should raise_error(Undefined)
     end
 

data/spec/cucumber/world/pending_spec.rb

@@ -7,7 +7,7 @@ module Cucumber
       before(:each) do
         @step_mom = Object.new
         @step_mom.extend(StepMother)
-        @world = @step_mom.new_world
+        @world = @step_mom.__send__(:new_world!)
       end
 
       it 'should raise a Pending if no block is supplied' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kosmas58-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.99.23
+  version: 0.1.100.5
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-13 00:00:00 -07:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +117,12 @@ files:
 - examples/i18n/de/features/division.feature
 - examples/i18n/de/features/step_definitons/calculator_steps.rb
 - examples/i18n/de/lib/calculator.rb
+- examples/i18n/en-lol/Rakefile
+- examples/i18n/en-lol/features/step_definitions/cucumbrz_steps.rb
+- examples/i18n/en-lol/features/stuffing.feature
+- examples/i18n/en-lol/features/support/env.rb
+- examples/i18n/en-lol/lib/basket.rb
+- examples/i18n/en-lol/lib/belly.rb
 - examples/i18n/en/Rakefile
 - examples/i18n/en/features/addition.feature
 - examples/i18n/en/features/division.feature
@@ -127,6 +133,7 @@ files:
 - examples/i18n/es/features/step_definitons/calculador_steps.rb
 - examples/i18n/es/lib/calculador.rb
 - examples/i18n/et/Rakefile
+- examples/i18n/et/features/jagamine.feature
 - examples/i18n/et/features/liitmine.feature
 - examples/i18n/et/features/step_definitions/kalkulaator_steps.rb
 - examples/i18n/et/lib/kalkulaator.rb
@@ -213,9 +220,15 @@ files:
 - examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Trader.java
 - examples/jbehave/src/main/java/cukes/jbehave/examples/trader/persistence/TraderPersister.java
 - examples/jbehave/src/main/java/cukes/jbehave/examples/trader/scenarios/TraderSteps.java
+- examples/jbehave/target/maven-archiver/pom.properties
 - examples/selenium/Rakefile
 - examples/selenium/features/search.feature
-- examples/selenium/features/step_definitons/stories_steps.rb
+- examples/selenium/features/step_definitons/search_steps.rb
+- examples/selenium/features/support/env.rb
+- examples/selenium_webrat/Rakefile
+- examples/selenium_webrat/features/search.feature
+- examples/selenium_webrat/features/step_definitons/search_steps.rb
+- examples/selenium_webrat/features/support/env.rb
 - examples/self_test/README.textile
 - examples/self_test/Rakefile
 - examples/self_test/features/background/failing_background.feature
@@ -250,6 +263,8 @@ files:
 - examples/tickets/features/177/2.feature
 - examples/tickets/features/177/3.feature
 - examples/tickets/features/180.feature
+- examples/tickets/features/236.feature
+- examples/tickets/features/241.feature
 - examples/tickets/features/lib/eatting_machine.rb
 - examples/tickets/features/lib/pantry.rb
 - examples/tickets/features/scenario_outline.feature
@@ -291,14 +306,15 @@ files:
 - lib/cucumber/ast/comment.rb
 - lib/cucumber/ast/examples.rb
 - lib/cucumber/ast/feature.rb
+- lib/cucumber/ast/feature_element.rb
 - lib/cucumber/ast/features.rb
-- lib/cucumber/ast/filter.rb
 - lib/cucumber/ast/outline_table.rb
 - lib/cucumber/ast/py_string.rb
 - lib/cucumber/ast/scenario.rb
 - lib/cucumber/ast/scenario_outline.rb
 - lib/cucumber/ast/step.rb
-- lib/cucumber/ast/steps.rb
+- lib/cucumber/ast/step_collection.rb
+- lib/cucumber/ast/step_invocation.rb
 - lib/cucumber/ast/table.rb
 - lib/cucumber/ast/tags.rb
 - lib/cucumber/ast/visitor.rb
@@ -338,8 +354,10 @@ files:
 - lib/cucumber/rails/world.rb
 - lib/cucumber/rake/task.rb
 - lib/cucumber/step_definition.rb
+- lib/cucumber/step_match.rb
 - lib/cucumber/step_mother.rb
 - lib/cucumber/version.rb
+- lib/cucumber/world.rb
 - rails_generators/cucumber/USAGE
 - rails_generators/cucumber/cucumber_generator.rb
 - rails_generators/cucumber/templates/cucumber
@@ -357,6 +375,7 @@ files:
 - spec/cucumber/ast/py_string_spec.rb
 - spec/cucumber/ast/scenario_outline_spec.rb
 - spec/cucumber/ast/scenario_spec.rb
+- spec/cucumber/ast/step_collection_spec.rb
 - spec/cucumber/ast/step_spec.rb
 - spec/cucumber/ast/table_spec.rb
 - spec/cucumber/ast/tags_spec.rb