cucumber 0.4.3 → 0.4.4

data/lib/cucumber/parser/table.tt

@@ -1,12 +1,13 @@
 module Cucumber
   module Parser
-    # TIP: When you hack on the grammar, just delete feature.rb in this directory.
+    # TIP: When you hack on the grammar, just delete table.rb in this directory.
     # Also make sure you have uninstalled all cucumber gems (don't forget xxx-cucumber
     # github gems).
     #
     # Treetop will then generate the parser in-memory. When you're happy, just generate
     # the rb file with tt feature.tt
     grammar Table
+      include Common
 
       rule table
         table_row+ {
@@ -54,18 +55,6 @@ module Cucumber
         (!('|' / eol) .)*
       end
 
-      rule space
-        [ \t]
-      end
-
-      rule eol
-        "\n" / ("\r" "\n"?)
-      end
-
-      rule eof
-        !.
-      end
-
     end
   end
 end

data/lib/cucumber/platform.rb

@@ -11,8 +11,9 @@ module Cucumber
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)
-  IRONRUBY      = Config::CONFIG['sitedir'] =~ /IronRuby/i
+  IRONRUBY      = defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby"
   WINDOWS       = Config::CONFIG['host_os'] =~ /mswin|mingw/
+  OS_X          = Config::CONFIG['host_os'] =~ /darwin/
   WINDOWS_MRI   = WINDOWS && !JRUBY && !IRONRUBY
   RAILS         = defined?(Rails)
   RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
@@ -27,4 +28,4 @@ module Cucumber
     end
   end
   self.use_full_backtrace = false
-end
+end

data/lib/cucumber/rails/active_record.rb

@@ -13,33 +13,14 @@ if defined?(ActiveRecord::Base)
 
   Before do
     if Cucumber::Rails::World.use_transactional_fixtures
-      @__cucumber_ar_connections = if ActiveRecord::Base.respond_to?(:connection_handler)
-        ActiveRecord::Base.connection_handler.connection_pools.values.map {|pool| pool.connection}
-      else
-        [ActiveRecord::Base.connection] # Rails <= 2.1.2
-      end
-      @__cucumber_ar_connections.each do |__cucumber_ar_connection|
-        if __cucumber_ar_connection.respond_to?(:increment_open_transactions)
-          __cucumber_ar_connection.increment_open_transactions
-        else
-          ActiveRecord::Base.__send__(:increment_open_transactions)
-        end
-        __cucumber_ar_connection.begin_db_transaction
-      end
+      run_callbacks :setup if respond_to?(:run_callbacks)
     end
     ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
   end
 
   After do
     if Cucumber::Rails::World.use_transactional_fixtures
-      @__cucumber_ar_connections.each do |__cucumber_ar_connection|
-        __cucumber_ar_connection.rollback_db_transaction
-        if __cucumber_ar_connection.respond_to?(:decrement_open_transactions)
-          __cucumber_ar_connection.decrement_open_transactions
-        else
-          ActiveRecord::Base.__send__(:decrement_open_transactions)
-        end
-      end
+      run_callbacks :teardown if respond_to?(:run_callbacks)
     end
   end
 else

data/lib/cucumber/rails/world.rb

@@ -8,13 +8,14 @@ end
 require 'cucumber/rails/test_unit'
 require 'cucumber/rails/action_controller'
 
-unless ::Rails.configuration.cache_classes
+if ::Rails.respond_to?(:configuration) && !(::Rails.configuration.cache_classes)
   warn "WARNING: You have set Rails' config.cache_classes to false (most likely in config/environments/cucumber.rb).  This setting is known to break Cucumber's use_transactional_fixtures method. Set config.cache_classes to true if you want to use transactional fixtures.  For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165."
 end
 
 module Cucumber #:nodoc:
   module Rails
     class World < ActionController::IntegrationTest
+      include ActiveSupport::Testing::SetupAndTeardown
       def initialize #:nodoc:
         @_result = Test::Unit::TestResult.new
       end

data/lib/cucumber/rb_support/rb_hook.rb

@@ -2,6 +2,7 @@ module Cucumber
   module RbSupport
     # Wrapper for Before, After and AfterStep hooks
     class RbHook
+      attr_accessor :tag_name_lists
       attr_reader :tag_names
       
       def initialize(rb_language, tag_names, proc)
@@ -15,4 +16,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/rb_support/rb_language.rb

@@ -35,6 +35,7 @@ module Cucumber
         @step_mother = step_mother
         @step_definitions = []
         RbDsl.rb_language = self
+        @world_proc = @world_modules = nil
       end
 
       # Tell the language about other i18n translations so that
@@ -87,13 +88,13 @@ module Cucumber
           multiline_class_comment = "# #{multiline_arg_class.default_arg_name} is a #{multiline_arg_class.to_s}\n  "
         end
 
-        "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  #{multiline_class_comment}pending\nend"
+        "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  #{multiline_class_comment}pending # express the regexp above with the code you wish you had\nend"
       end
 
-      def begin_rb_scenario
+      def begin_rb_scenario(scenario)
         create_world
         extend_world
-        connect_world
+        connect_world(scenario)
       end
 
       def register_rb_hook(phase, tag_names, proc)
@@ -125,8 +126,8 @@ module Cucumber
 
       protected
 
-      def begin_scenario
-        begin_rb_scenario
+      def begin_scenario(scenario)
+        begin_rb_scenario(scenario)
       end
       
       def end_scenario
@@ -155,8 +156,9 @@ module Cucumber
         end
       end
 
-      def connect_world
+      def connect_world(scenario)
         @current_world.__cucumber_step_mother = @step_mother
+        @current_world.__natural_language = scenario.language
       end
 
       def check_nil(o, proc)

data/lib/cucumber/rb_support/rb_step_definition.rb

@@ -59,6 +59,10 @@ module Cucumber
         end
       end
 
+      def backtrace_line
+        @proc.backtrace_line(regexp_source)
+      end
+
       def file_colon_line
         @proc.file_colon_line
       end

data/lib/cucumber/rb_support/rb_world.rb

@@ -14,56 +14,35 @@ module Cucumber
         rb.execute_transforms([arg]).first
       end
     
-      attr_writer :__cucumber_step_mother
+      attr_writer :__cucumber_step_mother, :__natural_language
 
       # Call a step from within a step definition. This method is aliased to
       # the same i18n as RbDsl.
       def __cucumber_invoke(name, multiline_argument=nil) #:nodoc:
-        begin
-          @__cucumber_step_mother.invoke(name, multiline_argument)
-        rescue Exception => e
-          e.nested! if Undefined === e
-          raise e
-        end
+        @__cucumber_step_mother.invoke(name, multiline_argument)
       end
 
-      # 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     }
-      #   ])
-      #
+      # See StepMother#invoke_steps
+      def steps(steps_text)
+        @__cucumber_step_mother.invoke_steps(steps_text, @__natural_language)
+      end
+
+      # See StepMother#table
       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
+        @__cucumber_step_mother.table(text_or_table, file, line_offset)
       end
 
-      # Output +announcement+ alongside the formatted output.
-      # This is an alternative to using Kernel#puts - it will display
-      # nicer, and in all outputs (in case you use several formatters)
-      #
-      # Beware that the output will be printed *before* the corresponding
-      # 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.
+      # See StepMother#py_string
+      def py_string(string_with_triple_quotes, file=nil, line_offset=0)
+        @__cucumber_step_mother.py_string(text_or_table, file, line_offset)
+      end
+
+      # See StepMother#announce
       def announce(announcement)
         @__cucumber_step_mother.announce(announcement)
       end
 
+      # See StepMother#embed
       def embed(file, mime_type)
         @__cucumber_step_mother.embed(file, mime_type)
       end

data/lib/cucumber/step_mother.rb

@@ -49,6 +49,7 @@ module Cucumber
       @programming_languages = []
       @language_map = {}
       load_natural_language('en')
+      @current_scenario = nil
     end
 
     def load_plain_text_features(feature_files)
@@ -126,10 +127,21 @@ module Cucumber
       end
     end
 
-    def announce(msg) #:nodoc:
+    # Output +announcement+ alongside the formatted output.
+    # This is an alternative to using Kernel#puts - it will display
+    # nicer, and in all outputs (in case you use several formatters)
+    #
+    # Beware that the output will be printed *before* the corresponding
+    # 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(msg)
       @visitor.announce(msg)
     end
 
+    # Embed +file+ of MIME type +mime_type+ into the output. This may or may
+    # not be ignored, depending on what kind of formatter(s) are active.
+    #
     def embed(file, mime_type)
       @visitor.embed(file, mime_type)
     end
@@ -144,7 +156,79 @@ module Cucumber
     end
 
     def invoke(step_name, multiline_argument=nil)
-      step_match(step_name).invoke(multiline_argument)
+      begin
+        step_match(step_name).invoke(multiline_argument)
+      rescue Exception => e
+        e.nested! if Undefined === e
+        raise e
+      end
+    end
+
+    # Invokes a series of steps +steps_text+. Example:
+    #
+    #   invoke(%Q{
+    #     Given I have 8 cukes in my belly
+    #     Then I should not be thirsty
+    #   })
+    def invoke_steps(steps_text, natural_language)
+      ored_keywords = natural_language.step_keywords.join("|")
+      after_keyword = natural_language.space_after_keyword ? ' ' : ''
+      # TODO Gherkin:
+      # This a bit hacky and fragile. When we move to Gherkin we should replace this entire method body
+      # with a call to the parser - parsing the body of a scenario. We may need to put the parser/policy in the
+      # appropriate state (the same state it's in after parsing a Scenario: line).
+      steps_text.strip.split(/(?=^\s*(?:#{ored_keywords}))/).map { |step| step.strip }.each do |step|
+        output = step.match(/^\s*(#{ored_keywords})#{after_keyword}([^\n]+)(\n.*)?$/m)
+
+        action, step_name, table_or_string = output[1], output[2], output[3]
+        if table_or_string.to_s.strip =~ /^\|/
+          table_or_string = table(table_or_string) 
+        elsif table_or_string.to_s.strip =~ /^"""/
+          table_or_string = py_string(table_or_string.gsub(/^\n/, ""))
+        end
+        args = [step_name, table_or_string].compact
+        invoke(*args)
+      end
+    end
+
+    # 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
+
+    # Returns a regular String for +string_with_triple_quotes+. Example:
+    #
+    #   """
+    #    hello
+    #   world
+    #   """
+    #
+    # Is retured as: " hello\nworld"
+    #
+    def py_string(string_with_triple_quotes, file=nil, line_offset=0)
+      @py_string_parser ||= Parser::PyStringParser.new
+      @py_string_parser.parse_or_fail(string_with_triple_quotes, file, line_offset).to_s
     end
 
     def step_match(step_name, name_to_report=nil) #:nodoc:

data/lib/cucumber/wire_support/wire_language.rb

@@ -34,8 +34,8 @@ module Cucumber
       
       protected
       
-      def begin_scenario
-        @connections.each { |remote| remote.begin_scenario }
+      def begin_scenario(scenario)
+        @connections.each { |remote| remote.begin_scenario(scenario) }
       end
       
       def end_scenario

data/lib/cucumber/wire_support/wire_protocol.rb

@@ -36,7 +36,7 @@ module Cucumber
         end
       end
       
-      def begin_scenario
+      def begin_scenario(scenario)
         make_request(:begin_scenario) do
           def handle_success(params)
           end

data/rails_generators/cucumber/cucumber_generator.rb

@@ -16,7 +16,9 @@ class CucumberGenerator < Rails::Generator::Base
         :assigns => { :cucumber_version => ::Cucumber::VERSION }
 
       m.gsub_file 'config/database.yml', /test:.*\n/, "test: &TEST\n"
-      m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *TEST"
+      unless File.read('config/database.yml').include? 'cucumber:'
+        m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *TEST"
+      end
 
       m.directory 'features/support'
       if spork?

data/rails_generators/cucumber/templates/cucumber.rake

@@ -1,5 +1,7 @@
 # This file was generated by 
-$LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
+# Find vendored gem or plugin of cucumber
+vendored_cucumber_dir = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*"].first
+$LOAD_PATH.unshift("#{vendored_cucumber_dir}/lib") unless vendored_cucumber_dir.nil?
 
 unless ARGV.any? {|a| a =~ /^gems/}
 
@@ -8,7 +10,7 @@ begin
 
   # Use vendored cucumber binary if possible. If it's not vendored,
   # Cucumber::Rake::Task will automatically use installed gem's cucumber binary
-  vendored_cucumber_binary = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+  vendored_cucumber_binary = "#{vendored_cucumber_dir}/bin/cucumber" unless vendored_cucumber_dir.nil?
 
   namespace :cucumber do
     Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -8,31 +8,31 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "pat
 # Commonly used webrat steps
 # http://github.com/brynary/webrat
 
-Given /^I am on (.+)$/ do |page_name|
+Given /^(?:|I )am on (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^I go to (.+)$/ do |page_name|
+When /^(?:|I )go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^I press "([^\"]*)"$/ do |button|
+When /^(?:|I )press "([^\"]*)"$/ do |button|
   click_button(button)
 end
 
-When /^I follow "([^\"]*)"$/ do |link|
+When /^(?:|I )follow "([^\"]*)"$/ do |link|
   click_link(link)
 end
 
-When /^I follow "([^\"]*)" within "([^\"]*)"$/ do |link, parent|
+When /^(?:|I )follow "([^\"]*)" within "([^\"]*)"$/ do |link, parent|
   click_link_within(parent, link)
 end
 
-When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
+When /^(?:|I )fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
   fill_in(field, :with => value)
 end
 
-When /^I fill in "([^\"]*)" for "([^\"]*)"$/ do |value, field|
+When /^(?:|I )fill in "([^\"]*)" for "([^\"]*)"$/ do |value, field|
   fill_in(field, :with => value)
 end
 
@@ -47,19 +47,19 @@ end
 # TODO: Add support for checkbox, select og option
 # based on naming conventions.
 #
-When /^I fill in the following:$/ do |fields|
+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|
+When /^(?:|I )select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
   select(value, :from => field)
 end
 
 # Use this step in conjunction with Rail's datetime_select helper. For example:
 # When I select "December 25, 2008 10:00" as the date and time
-When /^I select "([^\"]*)" as the date and time$/ do |time|
+When /^(?:|I )select "([^\"]*)" as the date and time$/ do |time|
   select_datetime(time)
 end
 
@@ -72,7 +72,7 @@ end
 # The following steps would fill out the form:
 # When I select "November 23, 2004 11:20" as the "Preferred" date and time
 # And I select "November 25, 2004 10:30" as the "Alternative" date and time
-When /^I select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label|
+When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label|
   select_datetime(datetime, :from => datetime_label)
 end
 
@@ -80,47 +80,47 @@ end
 # When I select "2:20PM" as the time
 # Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
 # will convert the 2:20PM to 14:20 and then select it.
-When /^I select "([^\"]*)" as the time$/ do |time|
+When /^(?:|I )select "([^\"]*)" as the time$/ do |time|
   select_time(time)
 end
 
 # Use this step when using multiple time_select helpers on a page or you want to
 # specify the name of the time on the form.  For example:
 # When I select "7:30AM" as the "Gym" time
-When /^I select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label|
+When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label|
   select_time(time, :from => time_label)
 end
 
 # Use this step in conjunction with Rail's date_select helper.  For example:
 # When I select "February 20, 1981" as the date
-When /^I select "([^\"]*)" as the date$/ do |date|
+When /^(?:|I )select "([^\"]*)" as the date$/ do |date|
   select_date(date)
 end
 
 # Use this step when using multiple date_select helpers on one page or
 # you want to specify the name of the date on the form. For example:
 # When I select "April 26, 1982" as the "Date of Birth" date
-When /^I select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label|
+When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label|
   select_date(date, :from => date_label)
 end
 
-When /^I check "([^\"]*)"$/ do |field|
+When /^(?:|I )check "([^\"]*)"$/ do |field|
   check(field)
 end
 
-When /^I uncheck "([^\"]*)"$/ do |field|
+When /^(?:|I )uncheck "([^\"]*)"$/ do |field|
   uncheck(field)
 end
 
-When /^I choose "([^\"]*)"$/ do |field|
+When /^(?:|I )choose "([^\"]*)"$/ do |field|
   choose(field)
 end
 
-When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field|
+When /^(?:|I )attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field|
   attach_file(field, path)
 end
 
-Then /^I should see "([^\"]*)"$/ do |text|
+Then /^(?:|I )should see "([^\"]*)"$/ do |text|
 <% if framework == :rspec -%>
   response.should contain(text)
 <% else -%>
@@ -128,7 +128,7 @@ Then /^I should see "([^\"]*)"$/ do |text|
 <% end -%>
 end
 
-Then /^I should see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
+Then /^(?:|I )should see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
   within(selector) do |content|
 <% if framework == :rspec -%>
     content.should contain(text)
@@ -138,7 +138,7 @@ Then /^I should see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
   end
 end
 
-Then /^I should see \/([^\/]*)\/$/ do |regexp|
+Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
 <% if framework == :rspec -%>
   response.should contain(regexp)
@@ -147,7 +147,7 @@ Then /^I should see \/([^\/]*)\/$/ do |regexp|
 <% end -%>
 end
 
-Then /^I should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
+Then /^(?:|I )should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
   within(selector) do |content|
     regexp = Regexp.new(regexp)
 <% if framework == :rspec -%>
@@ -158,7 +158,7 @@ Then /^I should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
   end
 end
 
-Then /^I should not see "([^\"]*)"$/ do |text|
+Then /^(?:|I )should not see "([^\"]*)"$/ do |text|
 <% if framework == :rspec -%>
   response.should_not contain(text)
 <% else -%>
@@ -166,7 +166,7 @@ Then /^I should not see "([^\"]*)"$/ do |text|
 <% end -%>
 end
 
-Then /^I should not see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
+Then /^(?:|I )should not see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
   within(selector) do |content|
 <% if framework == :rspec -%>
     content.should_not contain(text)
@@ -176,7 +176,7 @@ Then /^I should not see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
   end
 end
 
-Then /^I should not see \/([^\/]*)\/$/ do |regexp|
+Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
 <% if framework == :rspec -%>
   response.should_not contain(regexp)
@@ -185,7 +185,7 @@ Then /^I should not see \/([^\/]*)\/$/ do |regexp|
 <% end -%>
 end
 
-Then /^I should not see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
+Then /^(?:|I )should not see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
   within(selector) do |content|
     regexp = Regexp.new(regexp)
 <% if framework == :rspec -%>
@@ -228,7 +228,7 @@ Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
 <% end -%>
 end
 
-Then /^I should be on (.+)$/ do |page_name|
+Then /^(?:|I )should be on (.+)$/ do |page_name|
 <% if framework == :rspec -%>
   URI.parse(current_url).path.should == path_to(page_name)
 <% else -%>