cucumber 0.3.96 → 0.3.97

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -27,6 +27,10 @@ When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
   fill_in(field, :with => value) 
 end
 
+When /^I fill in "([^\"]*)" for "([^\"]*)"$/ do |value, field|
+  fill_in(field, :with => value)
+end
+
 # Use this to fill in an entire form with data from a table. Example:
 #
 #   When I fill in the following:

data/spec/cucumber/ast/background_spec.rb

@@ -10,7 +10,7 @@ module Cucumber
         extend(RbSupport::RbDsl)
         @step_mother = StepMother.new
         @step_mother.load_natural_language('en')
-        @step_mother.load_programming_language('rb')
+        @rb = @step_mother.load_programming_language('rb')
 
         $x = $y = nil
         Before do
@@ -19,12 +19,19 @@ module Cucumber
         Given /y is (\d+)/ do |n|
           $y = $x * n.to_i
         end
+
+        register
+
         @visitor = Visitor.new(@step_mother)
         @visitor.options = {}
 
         @feature = mock('feature', :visit? => true).as_null_object
       end
 
+      def register
+        @step_mother.register_step_definitions(@rb.step_definitions)
+      end
+
       it "should execute Before blocks before background steps" do
         background = Background.new(
           comment=Comment.new(''),

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -41,6 +41,7 @@ module Cucumber
           ],
           [
             [
+              Comment.new("#Mmmm... cucumbers\n"),
               24,
               'Examples:',
               'First table',

data/spec/cucumber/ast/table_spec.rb

@@ -285,6 +285,16 @@ module Cucumber
             |     aslak |     true |
           }
         end
+
+        it "should not allow mappings that match more than 1 column" do
+          t1 = Table.new([
+            ['Cuke',  'Duke'],
+            ['Foo', 'Bar']
+          ])
+          lambda do
+            t1.map_headers!(/uk/ => 'u')
+          end.should raise_error(%{2 headers matched /uk/: ["Cuke", "Duke"]})
+        end
         
         describe "raising" do
           before do

data/spec/cucumber/cli/options_spec.rb

@@ -46,7 +46,7 @@ module Cli
 
       context '-r or --require' do
         it "collects all specified files into an array" do
-          after_parsing ('--require some_file.rb -r another_file.rb') do
+          after_parsing('--require some_file.rb -r another_file.rb') do
             options[:require].should == ['some_file.rb', 'another_file.rb']
           end
         end

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -349,6 +349,10 @@ Given I am a step
         it "should parse scenario_outline" do
           parse_file("scenario_outline.feature")
         end
+
+        it "should parse comments" do
+          parse_file("with_comments.feature")
+        end
       end
 
       describe "Filtering" do

data/spec/cucumber/rb_support/rb_step_definition_spec.rb

@@ -0,0 +1,114 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'cucumber/ast'
+require 'cucumber/step_mother'
+require 'cucumber/rb_support/rb_language'
+
+module Cucumber
+  module RbSupport
+    describe RbStepDefinition do
+      before do      
+        @step_mother = StepMother.new
+        @step_mother.load_natural_language('en')
+        @rb = @step_mother.load_programming_language('rb')
+        @dsl = Object.new 
+        @dsl.extend RbSupport::RbDsl
+        @step_mother.before(nil)
+
+        $inside = nil
+      end
+      
+      def register
+        @step_mother.register_step_definitions(@rb.step_definitions)
+      end
+
+      it "should allow calling of other steps" do
+        @dsl.Given /Outside/ do
+          Given "Inside"
+        end
+        @dsl.Given /Inside/ do
+          $inside = true
+        end
+        register
+
+        @step_mother.step_match("Outside").invoke(nil)
+        $inside.should == true
+      end
+
+      it "should allow calling of other steps with inline arg" do
+        @dsl.Given /Outside/ do
+          Given "Inside", Ast::Table.new([['inside']])
+        end
+        @dsl.Given /Inside/ do |table|
+          $inside = table.raw[0][0]
+        end
+        register
+
+        @step_mother.step_match("Outside").invoke(nil)
+        $inside.should == 'inside'
+      end
+
+      it "should raise Undefined when inside step is not defined" do
+        @dsl.Given /Outside/ do
+          Given 'Inside'
+        end
+        register
+
+        lambda do
+          @step_mother.step_match('Outside').invoke(nil)
+        end.should raise_error(Undefined, 'Undefined step: "Inside"')
+      end
+
+      it "should allow forced pending" do
+        @dsl.Given /Outside/ do
+          pending("Do me!")
+        end
+        register
+
+        lambda do
+          @step_mother.step_match("Outside").invoke(nil)
+        end.should raise_error(Pending, "Do me!")
+      end
+
+      it "should allow announce" do
+        v = mock('visitor')
+        v.should_receive(:announce).with('wasup')
+        @step_mother.visitor = v
+        @dsl.Given /Loud/ do
+          announce 'wasup'
+        end
+        register
+        
+        @step_mother.step_match("Loud").invoke(nil)
+      end
+    
+      def unindented(s)
+        s.split("\n")[1..-2].join("\n").indent(-10)
+      end
+    
+      it "should recognise quotes in name and make according regexp" do
+        @rb.snippet_text('Given', 'A "first" arg').should == unindented(%{
+          Given /^A "([^\\"]*)" arg$/ do |arg1|
+            pending
+          end
+        })
+      end
+
+      it "should recognise several quoted words in name and make according regexp and args" do
+        @rb.snippet_text('Given', 'A "first" and "second" arg').should == unindented(%{
+          Given /^A "([^\\"]*)" and "([^\\"]*)" arg$/ do |arg1, arg2|
+            pending
+          end
+        })
+      end
+
+      it "should not use quote group when there are no quotes" do
+        @rb.snippet_text('Given', 'A first arg').should == unindented(%{
+          Given /^A first arg$/ do
+            pending
+          end
+        })
+      end
+    end
+  end
+end

data/spec/cucumber/step_mother_spec.rb

@@ -16,11 +16,17 @@ module Cucumber
       @visitor = mock('Visitor')
     end
 
+    def register
+      @step_mother.register_step_definitions(@rb.step_definitions)
+    end
+
     it "should format step names" do
       @dsl.Given(/it (.*) in (.*)/) do |what, month|
       end
       @dsl.Given(/nope something else/) do |what, month|
       end
+      register
+      
       format = @step_mother.step_match("it snows in april").format_args("[%s]")
       format.should == "it [snows] in [april]"
     end
@@ -28,13 +34,14 @@ module Cucumber
     it "should raise Ambiguous error with guess hint when multiple step definitions match" do
       @dsl.Given(/Three (.*) mice/) {|disability|}
       @dsl.Given(/Three blind (.*)/) {|animal|}
+      register
 
       lambda do
         @step_mother.step_match("Three blind mice")
       end.should raise_error(Ambiguous, %{Ambiguous match of "Three blind mice":
 
-spec/cucumber/step_mother_spec.rb:29:in `/Three (.*) mice/'
-spec/cucumber/step_mother_spec.rb:30:in `/Three blind (.*)/'
+spec/cucumber/step_mother_spec.rb:35:in `/Three (.*) mice/'
+spec/cucumber/step_mother_spec.rb:36:in `/Three blind (.*)/'
 
 You can run again with --guess to make Cucumber be more smart about it
 })
@@ -42,15 +49,17 @@ You can run again with --guess to make Cucumber be more smart about it
 
     it "should not show --guess hint when --guess is used" do
       @step_mother.options = {:guess => true}
+
       @dsl.Given(/Three (.*) mice/) {|disability|}
       @dsl.Given(/Three cute (.*)/) {|animal|}
+      register
 
       lambda do
         @step_mother.step_match("Three cute mice")
       end.should raise_error(Ambiguous, %{Ambiguous match of "Three cute mice":
 
-spec/cucumber/step_mother_spec.rb:45:in `/Three (.*) mice/'
-spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
+spec/cucumber/step_mother_spec.rb:53:in `/Three (.*) mice/'
+spec/cucumber/step_mother_spec.rb:54:in `/Three cute (.*)/'
 
 })
     end
@@ -59,6 +68,7 @@ spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
       @step_mother.options = {:guess => true}
       @dsl.Given(/Three (.*) mice/) {|disability|}
       @dsl.Given(/Three (.*)/) {|animal|}
+      register
 
       lambda do
         @step_mother.step_match("Three blind mice")
@@ -69,6 +79,8 @@ spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
       @step_mother.options = {:guess => true}
       right = @dsl.Given(/Three (.*) mice/) {|disability|}
       wrong = @dsl.Given(/Three (.*)/) {|animal|}
+      register
+
       @step_mother.step_match("Three blind mice").step_definition.should == right
     end
     
@@ -76,6 +88,8 @@ spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
       @step_mother.options = {:guess => true}
       right = @dsl.Given(/Three (.*) mice ran (.*)/) {|disability|}
       wrong = @dsl.Given(/Three (.*)/) {|animal|}
+      register
+
       @step_mother.step_match("Three blind mice ran far").step_definition.should == right
     end
 
@@ -84,6 +98,8 @@ spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
       general       = @dsl.Given(/Three (.*) mice ran (.*)/) {|disability|}
       specific      = @dsl.Given(/Three blind mice ran far/) {}
       more_specific = @dsl.Given(/^Three blind mice ran far$/) {}
+      register
+
       @step_mother.step_match("Three blind mice ran far").step_definition.should == more_specific
     end
     
@@ -97,6 +113,7 @@ spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
       @dsl.Given(/Three (.*) mice/) {|disability|}
       lambda do
         @dsl.Given(/Three (.*) mice/) {|disability|}
+        register
       end.should raise_error(Redundant)
     end
 
@@ -104,6 +121,7 @@ spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
     it "should not raise Redundant unless it's really redundant" do
       @dsl.Given(/^(.*) (.*) user named '(.*)'$/) {|a,b,c|}
       @dsl.Given(/^there is no (.*) user named '(.*)'$/) {|a,b|}
+      register
     end
 
     it "should raise an error if the world is nil" do
@@ -115,7 +133,7 @@ spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
         raise "Should fail"
       rescue RbSupport::NilWorld => e
         e.message.should == "World procs should never return nil"
-        e.backtrace.should == ["spec/cucumber/step_mother_spec.rb:110:in `World'"]
+        e.backtrace.should == ["spec/cucumber/step_mother_spec.rb:128:in `World'"]
       end
     end
 
@@ -130,7 +148,7 @@ spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
 
     it "should implicitly extend world with modules" do
       @dsl.World(ModuleOne, ModuleTwo)
-      @step_mother.begin_scenario
+      @step_mother.before(nil)
       class << @rb.current_world
         included_modules.index(ModuleOne).should_not == nil
         included_modules.index(ModuleTwo).should_not == nil
@@ -145,10 +163,10 @@ spec/cucumber/step_mother_spec.rb:46:in `/Three cute (.*)/'
       end.should raise_error(RbSupport::MultipleWorld, %{You can only pass a proc to #World once, but it's happening
 in 2 places:
 
-spec/cucumber/step_mother_spec.rb:142:in `World'
-spec/cucumber/step_mother_spec.rb:144:in `World'
+spec/cucumber/step_mother_spec.rb:160:in `World'
+spec/cucumber/step_mother_spec.rb:162:in `World'
 
-Use Ruby modules instead to extend your worlds. See the Cucumber::StepMother#World RDoc
+Use Ruby modules instead to extend your worlds. See the Cucumber::RbSupport::RbDsl#World RDoc
 or http://wiki.github.com/aslakhellesoy/cucumber/a-whole-new-world.
 
 })
@@ -157,12 +175,13 @@ or http://wiki.github.com/aslakhellesoy/cucumber/a-whole-new-world.
     it "should find before hooks" do
       fish = @dsl.Before('@fish'){}
       meat = @dsl.Before('@meat'){}
+      register
       
       scenario = mock('Scenario')
       scenario.should_receive(:accept_hook?).with(fish).and_return(true)
       scenario.should_receive(:accept_hook?).with(meat).and_return(false)
       
-      @step_mother.hooks_for(:before, scenario).should == [fish]
+      @rb.hooks_for(:before, scenario).should == [fish]
     end
   end
 end

data/spec/cucumber/treetop_parser/with_comments.feature

@@ -2,9 +2,22 @@
 # Two lines
 Feature: Some header  
 
+  Background:
+  # comment
+  Given whatever
+
   # Scenario header
   # on two lines
   Scenario: Some scenario
     Given one
 #    When two
-    Then three
+    Then three
+    
+  Scenario Outline: Some outline
+    Given <one>
+    Then <two>
+  
+  # Examples group comment  
+  Examples:
+  | one | two |
+  | a   | b   |

data/spec/cucumber/world/pending_spec.rb

@@ -6,7 +6,7 @@ module Cucumber
 
       before(:each) do
         l = RbSupport::RbLanguage.new(StepMother.new)
-        l.begin_scenario
+        l.begin_rb_scenario
         @world = l.current_world
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.96
+  version: 0.3.97
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-20 00:00:00 +02:00
+date: 2009-08-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.3.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: polyglot
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.8
+    version: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   type: :runtime
@@ -235,6 +245,7 @@ files:
 - examples/junit/features/step_definitions/steps.rb
 - examples/pure_java/README.textile
 - examples/python/features/fibonacci.feature
+- examples/python/features/step_definitions/fib_steps.py
 - examples/python/features/step_definitions/fib_steps.rb
 - examples/python/features/support/env.rb
 - examples/python/lib/fib.py
@@ -356,7 +367,8 @@ files:
 - gem_tasks/gemspec.rake
 - gem_tasks/rspec.rake
 - gem_tasks/sass.rake
-- gem_tasks/yard.rake
+- gem_tasks/sdoc.rake
+- lib/README.rdoc
 - lib/autotest/cucumber.rb
 - lib/autotest/cucumber_mixin.rb
 - lib/autotest/cucumber_rails.rb
@@ -413,7 +425,7 @@ files:
 - lib/cucumber/formatter/unicode.rb
 - lib/cucumber/formatter/usage.rb
 - lib/cucumber/formatters/unicode.rb
-- lib/cucumber/language_support/hook_methods.rb
+- lib/cucumber/language_support.rb
 - lib/cucumber/language_support/language_methods.rb
 - lib/cucumber/language_support/step_definition_methods.rb
 - lib/cucumber/languages.yml
@@ -426,6 +438,9 @@ files:
 - lib/cucumber/parser/table.tt
 - lib/cucumber/parser/treetop_ext.rb
 - lib/cucumber/platform.rb
+- lib/cucumber/py_support/py_dsl.py
+- lib/cucumber/py_support/py_language.py
+- lib/cucumber/py_support/py_language.rb
 - lib/cucumber/rails/rspec.rb
 - lib/cucumber/rails/world.rb
 - lib/cucumber/rake/task.rb
@@ -433,13 +448,13 @@ files:
 - lib/cucumber/rb_support/rb_hook.rb
 - lib/cucumber/rb_support/rb_language.rb
 - lib/cucumber/rb_support/rb_step_definition.rb
+- lib/cucumber/rb_support/rb_world.rb
 - lib/cucumber/rspec_neuter.rb
 - lib/cucumber/step_match.rb
 - lib/cucumber/step_mother.rb
 - lib/cucumber/version.rb
 - lib/cucumber/webrat/element_locator.rb
 - lib/cucumber/webrat/table_locator.rb
-- lib/cucumber/world.rb
 - rails_generators/cucumber/USAGE
 - rails_generators/cucumber/cucumber_generator.rb
 - rails_generators/cucumber/templates/cucumber
@@ -463,7 +478,6 @@ files:
 - spec/cucumber/ast/step_collection_spec.rb
 - spec/cucumber/ast/step_spec.rb
 - spec/cucumber/ast/table_spec.rb
-- spec/cucumber/ast/visitor_spec.rb
 - spec/cucumber/broadcaster_spec.rb
 - spec/cucumber/cli/configuration_spec.rb
 - spec/cucumber/cli/drb_client_spec.rb
@@ -482,8 +496,8 @@ files:
 - spec/cucumber/rails/stubs/mini_rails.rb
 - spec/cucumber/rails/stubs/test_help.rb
 - spec/cucumber/rails/world_spec.rb
+- spec/cucumber/rb_support/rb_step_definition_spec.rb
 - spec/cucumber/sell_cucumbers.feature
-- spec/cucumber/step_definition_spec.rb
 - spec/cucumber/step_mother_spec.rb
 - spec/cucumber/treetop_parser/empty_feature.feature
 - spec/cucumber/treetop_parser/empty_scenario.feature