cucumber 0.3.95 → 0.3.96

data/lib/cucumber/version.rb

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

data/lib/cucumber/webrat/element_locator.rb

@@ -1,15 +1,15 @@
 module Webrat
   class Element
-    # Returns an Array of Array of String where each String is the
-    # a "cell" in the table-like structure represented by this Element.
+    # Returns an Array of Array of String where each String is a
+    # "cell" in the table-like structure represented by this Element.
     #
-    # Supported elements are table, dl, ol and ul. The return value depends
-    # on the type of the element:
+    # Supported elements are table, dl, ol and ul. Different conversion
+    # strategies are used depending on the kind of element:
     #
-    # * table    : Each tr is a row. The innerHTML of each tr or th becomes cells. The number 
+    # * table    : Each tr becomes a row. The innerHTML of each td or th inside becomes a cell. The number 
     #              of columns is determined by the number of cells in the first row.
-    # * dl       : Each dt creates a row with 2 cells. The innerHTML of the dt itself and the next dd become cells.
-    # * ul or ol : Each ul creates a row with one cell, the innerHTML of the ul.
+    # * dl       : Each dt becomes a row with 2 cells. The innerHTML of the dt itself and the next dd become cells.
+    # * ul or ol : Each li becomes a row with one cell, the innerHTML of the li.
     #
     def to_table
       case element.name

data/lib/cucumber/world.rb

@@ -7,23 +7,43 @@ module Cucumber
       end
     end
     
-    attr_writer :__cucumber_step_mother, :__cucumber_visitor, :__cucumber_current_step
+    attr_writer :__cucumber_step_mother
 
     # Call a step from within a step definition
     def __cucumber_invoke(name, multiline_argument=nil) #:nodoc:
       begin
         step_match = @__cucumber_step_mother.step_match(name)
-        step_match.invoke(self, multiline_argument)
+        step_match.invoke(multiline_argument)
       rescue Exception => e
         e.nested! if Undefined === e
-        @__cucumber_current_step.exception = e if @__cucumber_current_step
         raise e
       end
     end
-    
-    def table(text, file=nil, line_offset=0)
-      @table_parser ||= Parser::TableParser.new
-      @table_parser.parse_or_fail(text.strip, file, line_offset)
+
+    # Returns a Cucumber::Ast::Table for +text_or_table+, which can either
+    # be a String:
+    #
+    #   table(%{
+    #     | account | description | amount |
+    #     | INT-100 | Taxi        | 114    |
+    #     | CUC-101 | Peeler      | 22     |
+    #   })
+    #
+    # or a 2D Array:
+    #
+    #   table([
+    #     %w{ account description amount },
+    #     %w{ INT-100 Taxi        114    },
+    #     %w{ CUC-101 Peeler      22     }
+    #   ])
+    #
+    def table(text_or_table, file=nil, line_offset=0)
+      if Array === text_or_table
+        Ast::Table.new(text_or_table)
+      else
+        @table_parser ||= Parser::TableParser.new
+        @table_parser.parse_or_fail(text_or_table.strip, file, line_offset)
+      end
     end
 
     # Output +announcement+ alongside the formatted output.
@@ -34,7 +54,7 @@ module Cucumber
     # step. This is because the step itself will not be printed until
     # after it has run, so it can be coloured according to its status.
     def announce(announcement)
-      @__cucumber_visitor.announce(announcement)
+      @__cucumber_step_mother.announce(announcement)
     end
 
     def pending(message = "TODO")

data/rails_generators/cucumber/templates/cucumber_environment.rb

@@ -16,11 +16,11 @@ config.action_controller.allow_forgery_protection    = false
 config.action_mailer.delivery_method = :test
 
 config.gem 'cucumber',    :lib => false,        :version => '>=<%= cucumber_version %>' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
-config.gem 'webrat',      :lib => false,        :version => '>=0.4.4' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+config.gem 'webrat',      :lib => false,        :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
 <% if framework == :rspec -%>
 config.gem 'rspec',       :lib => false,        :version => '>=1.2.6' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
 config.gem 'rspec-rails', :lib => 'spec/rails', :version => '>=1.2.6' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
 <% end %>
 <% if spork? -%>
-config.gem 'spork',       :lib => false,        :version => '>=0.5.7' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
+config.gem 'spork',       :lib => false,        :version => '>=0.5.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
 <% end %>

data/rails_generators/cucumber/templates/spork_env.rb

@@ -18,14 +18,12 @@ Spork.prefork do
 
   # Comment out the next line if you don't want Cucumber Unicode support
   require 'cucumber/formatter/unicode'
-
   require 'spec/rails'
   require 'cucumber/rails/rspec'
 end
  
 Spork.each_run do
   # This code will be run each time you run your specs.
-  require 'cucumber/rails/world'
 
   # Comment out the next line if you don't want transactions to
   # open/roll back around each scenario

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -27,6 +27,23 @@ When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
   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:
+#     | Account Number | 5002       |
+#     | Expiry date    | 2009-11-01 |
+#     | Note           | Nice guy   |
+#     | Wants Email?   |            |
+#
+# TODO: Add support for checkbox, select og option
+# based on naming conventions.
+#
+When /^I fill in the following:$/ do |fields|
+  fields.rows_hash.each do |name, value|
+    When %{I fill in "#{name}" with "#{value}"}
+  end
+end
+
 When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
   select(value, :from => field) 
 end

data/spec/cucumber/ast/background_spec.rb

@@ -1,18 +1,22 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'cucumber/ast'
+require 'cucumber/rb_support/rb_language'
 
 module Cucumber
   module Ast
     describe Background do
 
       before do
-        @step_mother = Object.new
-        @step_mother.extend(StepMother)
+        extend(RbSupport::RbDsl)
+        @step_mother = StepMother.new
+        @step_mother.load_natural_language('en')
+        @step_mother.load_programming_language('rb')
+
         $x = $y = nil
-        @step_mother.Before do
+        Before do
           $x = 2
         end
-        @step_mother.Given /y is (\d+)/ do |n|
+        Given /y is (\d+)/ do |n|
           $y = $x * n.to_i
         end
         @visitor = Visitor.new(@step_mother)
@@ -40,7 +44,6 @@ module Cucumber
           name="", 
           steps=[])
         background.feature = @feature
-        
         @visitor.visit_background(background)
         $x.should == 2
         $y.should == 10

data/spec/cucumber/ast/feature_factory.rb

@@ -10,14 +10,13 @@ module Cucumber
         end
       end
       
-      def create_feature(step_mother)
-        step_mother.extend(StepMother)
-        step_mother.Given /^a (.*) step with an inline arg:$/ do |what, table|
+      def create_feature(dsl)
+        dsl.Given /^a (.*) step with an inline arg:$/ do |what, table|
         end
-        step_mother.Given /^a (.*) step$/ do |what|
+        dsl.Given /^a (.*) step$/ do |what|
           flunk if what == 'failing'
         end
-        step_mother.World do
+        dsl.World do
           MyWorld.new
         end
 

data/spec/cucumber/ast/feature_spec.rb

@@ -7,7 +7,13 @@ module Cucumber
       include FeatureFactory
 
       it "should convert to sexp" do
-        feature = create_feature(Object.new)
+        step_mother = StepMother.new
+        step_mother.load_natural_language('en')
+        step_mother.load_programming_language('rb')
+        dsl = Object.new 
+        dsl.extend RbSupport::RbDsl
+
+        feature = create_feature(dsl)
         feature.to_sexp.should == 
         [:feature,
           "features/pretty_printing.feature",

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -2,24 +2,28 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require 'cucumber/step_mother'
 require 'cucumber/ast'
 require 'cucumber/core_ext/string'
+require 'cucumber/rb_support/rb_language'
 
 module Cucumber
   module Ast
     describe ScenarioOutline do
       before do
-        @step_mother = Object.new
-        @step_mother.extend(StepMother)
+        @step_mother = StepMother.new
+        @step_mother.load_programming_language('rb')
+        @step_mother.load_natural_language('en')
+        @dsl = Object.new
+        @dsl.extend(RbSupport::RbDsl)
 
-        @step_mother.Given(/^there are (\d+) cucumbers$/) do |n|
+        @dsl.Given(/^there are (\d+) cucumbers$/) do |n|
           @initial = n.to_i
         end
-        @step_mother.When(/^I eat (\d+) cucumbers$/) do |n|
+        @dsl.When(/^I eat (\d+) cucumbers$/) do |n|
           @eaten = n.to_i
         end
-        @step_mother.Then(/^I should have (\d+) cucumbers$/) do |n|
+        @dsl.Then(/^I should have (\d+) cucumbers$/) do |n|
           (@initial - @eaten).should == n.to_i
         end
-        @step_mother.Then(/^I should have (\d+) cucumbers in my belly$/) do |n|
+        @dsl.Then(/^I should have (\d+) cucumbers in my belly$/) do |n|
           @eaten.should == n.to_i
         end
 

data/spec/cucumber/ast/scenario_spec.rb

@@ -1,15 +1,20 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'cucumber/step_mother'
 require 'cucumber/ast'
+require 'cucumber/rb_support/rb_language'
 
 module Cucumber
   module Ast
     describe Scenario do
       before do
-        @step_mother = Object.new
-        @step_mother.extend(StepMother)
+        @step_mother = StepMother.new
+        @step_mother.load_natural_language('en')
+        @step_mother.load_programming_language('rb')
+        @dsl = Object.new
+        @dsl.extend(RbSupport::RbDsl)
+
         $x = $y = nil
-        @step_mother.Given /y is (\d+)/ do |n|
+        @dsl.Given /y is (\d+)/ do |n|
           $y = n.to_i
         end
         @visitor = Visitor.new(@step_mother)

data/spec/cucumber/ast/step_collection_spec.rb

@@ -6,8 +6,8 @@ module Cucumber
       it "should convert And to Given in snippets" do
         s1 = Step.new(1, 'Given', 'cukes')
         s2 = Step.new(2, 'And', 'turnips')
-        s1.stub!(:language).and_return(Parser::I18n::Language['en'])
-        s2.stub!(:language).and_return(Parser::I18n::Language['en'])
+        s1.stub!(:language).and_return(Parser::NaturalLanguage.get(nil, 'en'))
+        s2.stub!(:language).and_return(Parser::NaturalLanguage.get(nil, 'en'))
         c = StepCollection.new([s1, s2])
         actual_keywords = c.step_invocations.map{|i| i.actual_keyword}
         actual_keywords.should == %w{Given Given}

data/spec/cucumber/cli/configuration_spec.rb

@@ -13,6 +13,7 @@ module Cli
 
     def given_the_following_files(*files)
       File.stub!(:directory?).and_return(true)
+      File.stub!(:file?).and_return(true)
       Dir.stub!(:[]).and_return(files)
     end
 
@@ -114,6 +115,20 @@ module Cli
       end
     end
 
+    describe "#drb_port" do
+      it "is nil when not configured" do
+        config.parse!([])
+        config.drb_port.should be_nil
+      end
+
+      it "is numeric when configured" do
+        config.parse!(%w{features --port 1000})
+        config.drb_port.should == 1000
+      end
+
+
+    end
+
     it "uses the default profile when no profile is defined" do
       given_cucumber_yml_defined_as({'default' => '--require some_file'})
 

data/spec/cucumber/cli/drb_client_spec.rb

@@ -23,7 +23,7 @@ module Cucumber
         DRbClient.run(@args, @error_stream, @out_stream)
       end
 
-      it "runs the fearures on the DRb server" do
+      it "runs the features on the DRb server" do
         @drb_object.should_receive(:run).with(@args, @error_stream, @out_stream)
         DRbClient.run(@args, @error_stream, @out_stream)
       end
@@ -38,6 +38,40 @@ module Cucumber
         DRbClient.run(@args, @error_stream, @out_stream).should == 'foo'
       end
 
+      context "with $CUCUMBER_DRB set" do
+        before do 
+          @original_env = ENV['CUCUMBER_DRB']
+          ENV['CUCUMBER_DRB'] = '90000'
+        end
+        after do
+          ENV['CUCUMBER_DRB'] = @original_env
+        end
+        it "connects to specified DRb server" do
+          DRbObject.should_receive(:new_with_uri).with("druby://127.0.0.1:90000")
+          DRbClient.run(@args, @error_stream, @out_stream)
+        end
+      end
+
+      context "with provided drb_port" do
+        before do
+          @args = @args + ['--port', '8000']
+        end
+        it "connects to specified drb port" do
+          DRbObject.should_receive(:new_with_uri).with("druby://127.0.0.1:8000")
+          DRbClient.run(@args, @error_stream, @out_stream, 8000)
+        end
+        it "prefers configuration to environment"  do
+          original = ENV['CUCUMBER_DRB'] = original
+          begin
+            ENV['CUCUMBER_DRB'] = "4000"
+            DRbObject.should_receive(:new_with_uri).with("druby://127.0.0.1:8000")
+            DRbClient.run(@args, @error_stream, @out_stream, 8000)
+          ensure
+            ENV['CUCUMBER_DRB'] = original
+          end
+        end
+      end
+
     end
   end
 end

data/spec/cucumber/cli/main_spec.rb

@@ -29,7 +29,7 @@ module Cucumber
 
           FeatureFile.stub!(:new).and_return(mock("feature file", :parse => @empty_feature))
 
-          @cli.execute!(Object.new.extend(StepMother))
+          @cli.execute!(StepMother.new)
 
           @out.string.should include('example.feature')
         end
@@ -80,7 +80,7 @@ module Cucumber
             Object.should_receive(:const_get).with('ZooModule').and_return(mock_module)
             mock_module.should_receive(:const_get).with('MonkeyFormatterClass').and_return(mock('formatter class', :new => f))
 
-            cli.execute!(Object.new.extend(StepMother))
+            cli.execute!(StepMother.new)
           end
 
         end
@@ -93,7 +93,7 @@ module Cucumber
         configuration.stub!(:parse!).and_raise(exception_klass.new("error message"))
 
         main = Main.new('', out = StringIO.new, error = StringIO.new)
-        main.execute!(Object.new.extend(StepMother)).should be_true
+        main.execute!(StepMother.new).should be_true
         error.string.should == "error message\n"
       end
     end
@@ -111,7 +111,8 @@ module Cucumber
         end
 
         it "delegates the execution to the DRB client passing the args and streams" do
-          DRbClient.should_receive(:run).with(@args, @err, @out).and_return(true)
+          @configuration.stub :drb_port => 1450
+          DRbClient.should_receive(:run).with(@args, @err, @out, 1450).and_return(true)
           @cli.execute!(@step_mother)
         end
 

data/spec/cucumber/cli/options_spec.rb

@@ -68,6 +68,12 @@ module Cli
         end
       end
 
+      context "--port PORT" do
+        it "sets the drb_port to the provided option" do
+          after_parsing('--port 4500') { options[:drb_port].should == '4500' }
+        end
+      end
+
       context '-f FORMAT or --format FORMAT' do
         it "defaults the output for the formatter to the output stream (STDOUT)" do
           after_parsing('-f pretty') { options[:formats].should == [['pretty', output_stream]] }

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -1,11 +1,12 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require 'cucumber/parser/i18n/language'
+require 'cucumber/parser/natural_language'
 
 module Cucumber
   module Parser
     describe Feature do
       before do
-        @parser = I18n::Language['en'].parser
+        @step_mother = StepMother.new
+        @parser = NaturalLanguage.get(@step_mother, 'en').parser
       end
 
       def parse(text)
@@ -13,11 +14,11 @@ module Cucumber
       end
 
       def parse_file(file)
-        FeatureFile.new(File.dirname(__FILE__) + "/../treetop_parser/" + file).parse
+        FeatureFile.new(File.dirname(__FILE__) + "/../treetop_parser/" + file).parse(@step_mother, {})
       end
 
       def parse_example_file(file)
-        FeatureFile.new(File.dirname(__FILE__) + "/../../../examples/" + file).parse
+        FeatureFile.new(File.dirname(__FILE__) + "/../../../examples/" + file).parse(@step_mother, {})
       end
 
       describe "Comments" do
@@ -354,7 +355,7 @@ Given I am a step
         it "should filter outline tables" do
           ff = FeatureFile.new(
             File.dirname(__FILE__) + '/../../../examples/self_test/features/outline_sample.feature:12')
-          f = ff.parse({:lang => 'en'})
+          f = ff.parse(@step_mother, {:lang => 'en'})
           f.to_sexp.should ==
           [:feature,
            "./spec/cucumber/parser/../../../examples/self_test/features/outline_sample.feature",