cucumber 0.3.101 → 0.3.102

data/lib/cucumber/formatter/html.rb

@@ -68,7 +68,7 @@ module Cucumber
       def visit_tag_name(tag_name)
         @builder.text!(@tag_spacer) if @tag_spacer
         @tag_spacer = ' '
-        @builder.span("@#{tag_name}", :class => 'tag')
+        @builder.span(tag_name, :class => 'tag')
       end
 
       def visit_feature_name(name)

data/lib/cucumber/formatter/pdf.rb

@@ -197,7 +197,7 @@ module Cucumber
       end
 
       def visit_tag_name(tag_name)
-        tag = format_string("@#{tag_name}", :tag).indent(@indent)
+        tag = format_string(tag_name, :tag).indent(@indent)
         # TODO should we render tags at all? skipped for now. difficult to place due to page breaks
       end
 

data/lib/cucumber/formatter/pretty.rb

@@ -63,7 +63,7 @@ module Cucumber
       end
 
       def visit_tag_name(tag_name)
-        tag = format_string("@#{tag_name}", :tag).indent(@indent)
+        tag = format_string(tag_name, :tag).indent(@indent)
         @io.print(tag)
         @io.flush
         @indent = 1

data/lib/cucumber/language_support/language_methods.rb

@@ -23,11 +23,24 @@ module Cucumber
         end
       end
 
+      def execute_transforms(args)
+        transformed = nil
+        args.map do |arg|
+          transforms.detect {|t| transformed = t.invoke arg }
+          transformed || arg
+        end
+      end
+
       def add_hook(phase, hook)
         hooks[phase.to_sym] << hook
         hook
       end
 
+      def add_transform(transform)
+        transforms.unshift transform
+        transform
+      end
+
       def add_step_definition(step_definition)
         step_definitions << step_definition
         step_definition
@@ -47,6 +60,10 @@ module Cucumber
         @hooks ||= Hash.new{|h,k| h[k] = []}
       end
 
+      def transforms
+        @transforms ||= []
+      end
+
       def execute_before(scenario)
         hooks_for(:before, scenario).each do |hook|
           invoke(hook, 'Before', scenario, true)
@@ -54,7 +71,7 @@ module Cucumber
       end
 
       def execute_after(scenario)
-        hooks_for(:after, scenario).each do |hook|
+        hooks_for(:after, scenario).reverse_each do |hook|
           invoke(hook, 'After', scenario, true)
         end
       end
@@ -72,4 +89,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/language_support/step_definition_methods.rb

@@ -4,36 +4,13 @@ module Cucumber
   module LanguageSupport
     module StepDefinitionMethods
       def step_match(name_to_match, name_to_report)
-        if(match = regexp.match(name_to_match))
-          StepMatch.new(self, name_to_match, name_to_report, match.captures)
+        if(groups = groups(name_to_match))
+          StepMatch.new(self, name_to_match, name_to_report, groups)
         else
           nil
         end
       end
 
-      # Formats the matched arguments of the associated Step. This method
-      # is usually called from visitors, which render output.
-      #
-      # The +format+ can either be a String or a Proc.
-      #
-      # If it is a String it should be a format string according to
-      # <tt>Kernel#sprinf</tt>, for example:
-      #
-      #   '<span class="param">%s</span></tt>'
-      #
-      # If it is a Proc, it should take one argument and return the formatted
-      # argument, for example:
-      #
-      #   lambda { |param| "[#{param}]" }
-      #
-      def format_args(step_name, format)
-        step_name.gzub(regexp, format)
-      end
-
-      def same_regexp?(regexp)
-        self.regexp == regexp
-      end
-
       def backtrace_line
         "#{file_colon_line}:in `#{regexp.inspect}'"
       end

data/lib/cucumber/parser/feature.rb

@@ -55,14 +55,6 @@ module Cucumber
       end
 
       module FeatureSub2
-        def has_tags?(tag_names)
-          tags.has_tags?(tag_names)
-        end
-
-        def has_all_tags?(tag_names)
-          tags.has_all_tags?(tag_names)
-        end
-
         def build(filter)
           if(filter.nil? || feature_elements.accept?(filter) || (!bg.empty? && filter.accept?(bg)))
             background = bg.respond_to?(:build) ? bg.build : nil      
@@ -218,20 +210,12 @@ module Cucumber
           ts.elements.detect{|e| e.tag.line == line}
         end
 
-        def has_tags?(tags)
-          (tag_names & tags).any?
-        end
-
-        def has_all_tags?(tags)
-          (tags & tag_names) == tags
-        end
-
         def build
           Ast::Tags.new(ts.line, tag_names)
         end
         
         def tag_names
-          @tag_names ||= ts.elements.map{|e| e.tag.tag_name.text_value}
+          @tag_names ||= ts.elements.map{|e| e.tag.text_value}
         end
       end
 
@@ -313,9 +297,6 @@ module Cucumber
       end
 
       module Tag0
-        def tag_name
-          elements[1]
-        end
       end
 
       def _nt_tag
@@ -339,7 +320,7 @@ module Cucumber
           s2, i2 = [], index
           loop do
             if has_terminal?('\G[^@\\r\\n\\t ]', true, index)
-              r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r3 = true
               @index += 1
             else
               r3 = nil
@@ -510,14 +491,8 @@ module Cucumber
           steps.at_line?(line)
         end
 
-        def has_tags?(tag_names)
-          feature_tags = self.parent.tags
-          feature_tags.has_tags?(tag_names)
-        end
-
-        def has_all_tags?(tag_names)
-          feature_tags = self.parent.tags
-          feature_tags.has_all_tags?(tag_names)
+        def matches_tags?(tag_names)
+          Ast::Tags.matches?(self.parent.tags.tag_names, tag_names)
         end
 
         def build
@@ -712,14 +687,10 @@ module Cucumber
           tags.at_line?(line)
         end
 
-        def has_tags?(tag_names)
-          feature_tags = self.parent.parent.tags
-          tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
-        end
-
-        def has_all_tags?(tag_names)
-          feature_tags = self.parent.parent.tags
-          tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+        def matches_tags?(tag_names)
+          feature_tag_names = self.parent.parent.tags.tag_names
+          source_tag_names = (feature_tag_names + tags.tag_names).uniq
+          Ast::Tags.matches?(source_tag_names, tag_names)
         end
 
         def matches_name?(regexp_to_match)
@@ -855,14 +826,10 @@ module Cucumber
           steps.at_line?(line)
         end
 
-        def has_tags?(tag_names)
-          feature_tags = self.parent.parent.tags
-          tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
-        end
-
-        def has_all_tags?(tag_names)
-          feature_tags = self.parent.parent.tags
-          tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+        def matches_tags?(tag_names)
+          feature_tag_names = self.parent.parent.tags.tag_names
+          source_tag_names = (feature_tag_names + tags.tag_names).uniq
+          Ast::Tags.matches?(source_tag_names, tag_names)
         end
 
         def matches_name?(regexp_to_match)
@@ -1201,11 +1168,7 @@ module Cucumber
           table.at_line?(line)
         end
 
-        def has_tags?(tag_names)
-          true
-        end
-
-        def has_all_tags?(tag_names)
+        def matches_tags?(tag_names)
           true
         end
 

data/lib/cucumber/parser/feature.tt

@@ -18,14 +18,6 @@ module Cucumber
         bg:background? 
         feature_elements
         comment? {
-          def has_tags?(tag_names)
-            tags.has_tags?(tag_names)
-          end
-
-          def has_all_tags?(tag_names)
-            tags.has_all_tags?(tag_names)
-          end
-
           def build(filter)
             if(filter.nil? || feature_elements.accept?(filter) || (!bg.empty? && filter.accept?(bg)))
               background = bg.respond_to?(:build) ? bg.build : nil      
@@ -47,26 +39,18 @@ module Cucumber
             ts.elements.detect{|e| e.tag.line == line}
           end
 
-          def has_tags?(tags)
-            (tag_names & tags).any?
-          end
-
-          def has_all_tags?(tags)
-            (tags & tag_names) == tags
-          end
-
           def build
             Ast::Tags.new(ts.line, tag_names)
           end
           
           def tag_names
-            @tag_names ||= ts.elements.map{|e| e.tag.tag_name.text_value}
+            @tag_names ||= ts.elements.map{|e| e.tag.text_value}
           end
         }
       end
 
       rule tag
-        '@' tag_name:([^@\r\n\t ])+
+        '@' [^@\r\n\t ]+
       end
 
       rule comment
@@ -92,14 +76,8 @@ module Cucumber
             steps.at_line?(line)
           end
 
-          def has_tags?(tag_names)
-            feature_tags = self.parent.tags
-            feature_tags.has_tags?(tag_names)
-          end
-
-          def has_all_tags?(tag_names)
-            feature_tags = self.parent.tags
-            feature_tags.has_all_tags?(tag_names)
+          def matches_tags?(tag_names)
+            Ast::Tags.matches?(self.parent.tags.tag_names, tag_names)
           end
 
           def build
@@ -138,14 +116,10 @@ module Cucumber
             tags.at_line?(line)
           end
 
-          def has_tags?(tag_names)
-            feature_tags = self.parent.parent.tags
-            tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
-          end
-
-          def has_all_tags?(tag_names)
-            feature_tags = self.parent.parent.tags
-            tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+          def matches_tags?(tag_names)
+            feature_tag_names = self.parent.parent.tags.tag_names
+            source_tag_names = (feature_tag_names + tags.tag_names).uniq
+            Ast::Tags.matches?(source_tag_names, tag_names)
           end
 
           def matches_name?(regexp_to_match)
@@ -179,14 +153,10 @@ module Cucumber
             steps.at_line?(line)
           end
 
-          def has_tags?(tag_names)
-            feature_tags = self.parent.parent.tags
-            tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
-          end
-
-          def has_all_tags?(tag_names)
-            feature_tags = self.parent.parent.tags
-            tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+          def matches_tags?(tag_names)
+            feature_tag_names = self.parent.parent.tags.tag_names
+            source_tag_names = (feature_tag_names + tags.tag_names).uniq
+            Ast::Tags.matches?(source_tag_names, tag_names)
           end
 
           def matches_name?(regexp_to_match)
@@ -268,11 +238,7 @@ module Cucumber
             table.at_line?(line)
           end
 
-          def has_tags?(tag_names)
-            true
-          end
-
-          def has_all_tags?(tag_names)
+          def matches_tags?(tag_names)
             true
           end
 

data/lib/cucumber/parser/natural_language.rb

@@ -1,7 +1,7 @@
 module Cucumber
   module Parser
     class NaturalLanguage
-      KEYWORD_KEYS = %w{name native encoding feature background scenario scenario_outline examples given when then but}
+      KEYWORD_KEYS = %w{name native encoding space_after_keyword feature background scenario scenario_outline examples given when then and but}
 
       class << self
         def get(step_mother, lang)

data/lib/cucumber/rails/action_controller.rb

@@ -0,0 +1,33 @@
+ActionController::Base.class_eval do
+  cattr_accessor :allow_rescue
+  
+  alias_method :rescue_action_without_bypass, :rescue_action
+
+  def rescue_action(exception)
+    if ActionController::Base.allow_rescue
+      rescue_action_without_bypass(exception)
+    else
+      raise exception
+    end
+  end
+end
+
+begin
+  ActionController::Failsafe.class_eval do
+    alias_method :failsafe_response_without_bypass, :failsafe_response
+  
+    def failsafe_response(exception)
+      raise exception
+    end
+  end
+rescue NameError # Failsafe was introduced in Rails 2.3.2
+  ActionController::Dispatcher.class_eval do
+    def self.failsafe_response(output, status, exception = nil)
+      raise exception
+    end
+  end
+end
+
+Before('@allow_rescue') do
+  ActionController::Base.allow_rescue = true
+end

data/lib/cucumber/rails/active_record.rb

@@ -0,0 +1,27 @@
+if defined?(ActiveRecord::Base)
+  Cucumber::Rails::World.use_transactional_fixtures = true
+  
+  Before do
+    @__cucumber_ar_connection = ActiveRecord::Base.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
+    ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
+  end
+  
+  After do
+    @__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
+else
+  module Cucumber::Rails
+    def World.fixture_table_names; []; end # Workaround for projects that don't use ActiveRecord
+  end
+end

data/lib/cucumber/rails/rspec.rb

@@ -1,6 +1,6 @@
 require 'cucumber/rails/world'
 require 'spec/expectations'
-require 'spec/rails/matchers'
+require 'spec/rails'
 
 [Cucumber::Rails::World, ActionController::Integration::Session].each do |klass|
   klass.class_eval do

data/lib/cucumber/rails/test_unit.rb

@@ -0,0 +1,9 @@
+begin
+  require 'test/unit/testresult'
+rescue LoadError => e
+  e.message << "\nYou must gem install test-unit. For more info see https://rspec.lighthouseapp.com/projects/16211/tickets/292"
+  e.message << "\nAlso make sure you have rack 1.0.0 or higher."
+  raise e
+end
+# So that Test::Unit doesn't launch at the end - makes it think it has already been run.
+Test::Unit.run = true if Test::Unit.respond_to?(:run=)

data/lib/cucumber/rails/world.rb

@@ -1,6 +1,3 @@
-# Based on code from Brian Takita, Yurii Rashkovskii and Ben Mabey
-# Adapted by Aslak Hellesøy
-
 if defined?(ActiveRecord::Base)
   require 'test_help' 
 else
@@ -8,93 +5,25 @@ else
   require 'action_controller/integration'
 end
 
-begin
-  require 'test/unit/testresult'
-rescue LoadError => e
-  e.message << "\nYou must gem install test-unit. For more info see https://rspec.lighthouseapp.com/projects/16211/tickets/292"
-  e.message << "\nAlso make sure you have rack 1.0.0 or higher."
-  raise e
-end
-
-# So that Test::Unit doesn't launch at the end - makes it think it has already been run.
-Test::Unit.run = true if Test::Unit.respond_to?(:run=)
+require 'cucumber/rails/test_unit'
+require 'cucumber/rails/action_controller'
 
-$__cucumber_toplevel = self
+unless ::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
-    # All scenarios will execute in the context of a new instance of Cucumber::Rails:World if this file 
-    # is loaded. This gives Step Definitions access to all the methods from Rails' ActionController::IntegrationTest
     class World < ActionController::IntegrationTest
-      if defined?(ActiveRecord::Base)
-        self.use_transactional_fixtures = false
-      else
-        def self.fixture_table_names; []; end # Workaround for projects that don't use ActiveRecord
-      end
-
       def initialize #:nodoc:
         @_result = Test::Unit::TestResult.new
       end
     end
-
-    def self.use_transactional_fixtures
-
-      unless ::Rails.configuration.cache_classes
-        warn "WARNING: You have set Rails' config.cache_classes to false (most likely in config/environments/test.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
-
-      World.use_transactional_fixtures = true
-      if defined?(ActiveRecord::Base)
-        $__cucumber_toplevel.Before do
-          @__cucumber_ar_connection = ActiveRecord::Base.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
-          ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
-        end
-        
-        $__cucumber_toplevel.After do
-          @__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
-      end
-    end
-
-    def self.bypass_rescue
-      ActionController::Base.class_eval do
-        alias_method :rescue_action_without_bypass, :rescue_action
-
-        def rescue_action(exception)
-          raise exception
-        end
-      end
-
-      begin
-        ActionController::Failsafe.class_eval do
-          alias_method :failsafe_response_without_bypass, :failsafe_response
-        
-          def failsafe_response(exception)
-            raise exception
-          end
-        end
-      rescue NameError # Failsafe was introduced in Rails 2.3.2
-        ActionController::Dispatcher.class_eval do
-          def self.failsafe_response(output, status, exception = nil)
-            raise exception
-          end
-        end
-      end
-    end
   end
 end
 
+require 'cucumber/rails/active_record'
+
 World do
   Cucumber::Rails::World.new
 end