cucumber 0.3.0 → 0.3.1

data/lib/cucumber/parser/feature.tt

@@ -25,8 +25,8 @@ module Cucumber
           end
           
           def build(filter)
-            if(filter.nil? || feature_elements.accept?(filter))
-              background = bg.respond_to?(:build) ? bg.build : nil
+            if(filter.nil? || feature_elements.accept?(filter) || (!bg.empty? && filter.accept?(bg)))
+              background = bg.respond_to?(:build) ? bg.build : nil      
               Ast::Feature.new(
                 background, 
                 comment.build, 
@@ -76,13 +76,23 @@ module Cucumber
       end
 
       rule background
-         comment white background_keyword space* name:line_to_eol? (eol+ / eof) steps {
+         comment white background_keyword space* name:lines_to_keyword? (eol+ / eof) steps {
+
+           def matches_name?(regexp_to_match)
+             name.build =~ regexp_to_match
+           end
+
+          def has_tags?(tag_names)
+            feature_tags = self.parent.tags
+            feature_tags.has_tags?(tag_names)
+          end
+
            def build
              Ast::Background.new(
                comment.build, 
                background_keyword.line,
                background_keyword.text_value,
-               name.text_value, 
+               name.build, 
                steps.build
              )
             end
@@ -106,7 +116,7 @@ module Cucumber
       end
 
       rule scenario
-        comment tags white scenario_keyword space* name:line_to_eol white steps white {
+        comment tags white scenario_keyword space* name:lines_to_keyword white steps white {
           def at_line?(line)
             scenario_keyword.line == line ||
             steps.at_line?(line) ||
@@ -118,8 +128,8 @@ module Cucumber
             tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
           end
 
-          def matches_name?(name_to_match)
-            name.text_value == name_to_match
+          def matches_name?(regexp_to_match)
+            name.build =~ regexp_to_match
           end
 
           def build(background, filter)
@@ -129,7 +139,7 @@ module Cucumber
               tags.build,
               scenario_keyword.line,
               scenario_keyword.text_value, 
-              name.text_value, 
+              name.build, 
               steps.build
             )
           end
@@ -137,7 +147,7 @@ module Cucumber
       end
 
       rule scenario_outline
-        comment tags white scenario_outline_keyword space* name:line_to_eol white steps examples_sections white {
+        comment tags white scenario_outline_keyword space* name:lines_to_keyword white steps examples_sections white {
           def at_line?(line)
             outline_at_line?(line) ||
             examples_sections.at_line?(line) ||
@@ -154,8 +164,8 @@ module Cucumber
             tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
           end
 
-          def matches_name?(name_to_match)
-            name.text_value == name_to_match
+          def matches_name?(regexp_to_match)
+            name.build =~ regexp_to_match
           end
 
           def build(background, filter)
@@ -165,7 +175,7 @@ module Cucumber
               tags.build,
               scenario_outline_keyword.line, 
               scenario_outline_keyword.text_value, 
-              name.text_value, 
+              name.build, 
               steps.build, 
               examples_sections.build(filter, self)
             )
@@ -219,7 +229,7 @@ module Cucumber
       end
 
       rule examples
-        space* examples_keyword space* name:line_to_eol? eol table white {
+        space* examples_keyword space* name:lines_to_keyword? eol table white {
           def at_line?(line)
             examples_keyword.line == line ||
             table.at_line?(line)
@@ -233,8 +243,12 @@ module Cucumber
             true
           end
 
+          def matches_name?(regexp_to_match)
+            name.build =~ regexp_to_match
+          end
+
           def build(filter, scenario_outline)
-            [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw(filter, scenario_outline)]
+            [examples_keyword.line, examples_keyword.text_value, name.build, table.raw(filter, scenario_outline)]
           end
         }
       end
@@ -247,6 +261,22 @@ module Cucumber
         (!eol .)*
       end
 
+      rule line_to_keyword
+        white text:(!step_keyword !scenario_keyword !scenario_outline_keyword !table !tag !comment_line !eol .)+ {
+          def build
+            text.text_value.strip
+          end
+        }
+      end
+      
+      rule lines_to_keyword
+        (line_to_keyword)* { 
+        def build
+          elements.map{|s| s.build}.join("\n")
+        end
+        }
+      end
+
       rule py_string
         open_py_string s:(!close_py_string .)* close_py_string {
           def at_line?(line)

data/lib/cucumber/parser/treetop_ext.rb

@@ -17,7 +17,7 @@ module Cucumber
         @lines = lines
         @include_tags = options[:include_tags] || []
         @exclude_tags = options[:exclude_tags] || []
-        @names        = options[:scenario_names] || []
+        @name_regexps = options[:name_regexps] || []
       end
 
       def accept?(syntax_node)
@@ -48,7 +48,7 @@ module Cucumber
       end
       
       def matches_names?(syntax_node)
-        @names.nil? || @names.empty? || @names.detect{|name| syntax_node.matches_name?(name)}
+        @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.matches_name?(name_regexp)}
       end
     end
 
@@ -111,4 +111,4 @@ module Treetop
       include Cucumber::Parser::TreetopExt
     end
   end
-end
+end

data/lib/cucumber/rails/world.rb

@@ -9,6 +9,7 @@ else
 end
 require 'test/unit/testresult'
 
+
 # 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=)
 
@@ -30,6 +31,11 @@ module Cucumber #:nodoc:
     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

data/lib/cucumber/step_mother.rb

@@ -57,7 +57,8 @@ module Cucumber
       message << "in 2 places:\n\n"
       message << first_proc.backtrace_line('World') << "\n"
       message << second_proc.backtrace_line('World') << "\n\n"
-      message << "Use Ruby modules instead to extend your worlds. See the #World RDoc.\n\n"
+      message << "Use Ruby modules instead to extend your worlds. See the Cucumber::StepMother#World RDoc\n"
+      message << "or http://wiki.github.com/aslakhellesoy/cucumber/a-whole-new-world.\n\n"
       super(message)
     end
   end

data/lib/cucumber/version.rb

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

data/lib/cucumber/world.rb

@@ -16,7 +16,7 @@ module Cucumber
         step_match.invoke(self, multiline_argument)
       rescue Exception => e
         e.nested! if Undefined === e
-        @__cucumber_current_step.exception = e
+        @__cucumber_current_step.exception = e if @__cucumber_current_step
         raise e
       end
     end
@@ -50,4 +50,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/rails_generators/cucumber/templates/paths.rb

@@ -1,27 +1,25 @@
 module NavigationHelpers
-  # Maps a static name to a static route.
+  # Maps a name to a path. Used by the
   #
-  # This method is *not* designed to map from a dynamic name to a 
-  # dynamic route like <tt>post_comments_path(post)</tt>. For dynamic 
-  # routes like this you should *not* rely on #path_to, but write 
-  # your own step definitions instead. Example:
+  #   When /^I go to (.+)$/ do |page_name|
   #
-  #   Given /I am on the comments page for the "(.+)" post/ |name|
-  #     post = Post.find_by_name(name)
-  #     visit post_comments_path(post)
-  #   end
+  # step definition in webrat_steps.rb
   #
   def path_to(page_name)
     case page_name
     
     when /the homepage/
-      root_path
-    
-    # Add more page name => path mappings here
+      '/'
     
+    # Add more mappings here.
+    # Here is a more fancy example:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
+
     else
       raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
-        "Now, go and add a mapping in features/support/paths.rb"
+        "Now, go and add a mapping in #{__FILE__}"
     end
   end
 end

data/rails_generators/feature/feature_generator.rb

@@ -6,7 +6,7 @@ class FeatureGenerator < Rails::Generator::NamedBase
       m.template  'feature.erb', "features/manage_#{plural_name}.feature"
       m.template  'steps.erb', "features/step_definitions/#{singular_name}_steps.rb"
 
-      m.gsub_file 'features/support/paths.rb', /root_path/mi do |match|
+      m.gsub_file 'features/support/paths.rb', /'\/'/mi do |match|
         "#{match}\n    when /the new #{singular_name} page/\n      new_#{singular_name}_path\n"
       end
     end

data/spec/cucumber/ast/feature_element_spec.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/step_mother'
+require 'cucumber/ast'
+
+module Cucumber
+  describe FeatureElement do
+    include FeatureElement
+
+    describe "with multiline names" do
+      it "should select the longest line as the text length" do
+        @keyword = "key"  
+        @name = "short\nvery longer\ntiny"
+        text_length.should == 11 + Ast::Step::INDENT - 1
+      end
+      
+      it "should add keyword to first lines length" do
+        @keyword = "key"  
+        @name = "short\nvery longer\ntiny"
+        
+        first_line_length.should == (@keyword.jlength) + (first_line_name_length = 5)
+      end
+    end
+    
+    describe "with empty name" do
+      it "should only return the length of the keyword" do
+        @name = ""
+        @keyword = "key"
+        
+        text_length.should == 3
+      end
+    end
+
+    it "should support checking if its name matches a list of regexps" do
+      @name = 'test'
+      matches_scenario_names?([/es/]).should be_true
+    end
+    
+  end
+end
+

data/spec/cucumber/ast/py_string_spec.rb

@@ -40,6 +40,10 @@ module Cucumber
           py_string_with_replaced_arg.to_s.should == "''"
         end
 
+        it "should recognise when just a subset of a cell is delimited" do
+          @ps.should have_text('<qty>')
+        end
+
       end
       
     end

data/spec/cucumber/ast/table_spec.rb

@@ -21,6 +21,10 @@ module Cucumber
         @table.columns[1].map{|cell| cell.value}.should == %w{four 55555}
       end
 
+      it "should have headers" do
+        @table.headers.should == %w{one four seven}
+      end
+
       it "should have same cell objects in rows and columns" do
         # 666666
         @table.cells_rows[1].__send__(:[], 2).should equal(@table.columns[2].__send__(:[], 1))
@@ -57,7 +61,7 @@ module Cucumber
         }.should raise_error('The column named "two" does not exist')
       end
 
-      describe ".transpose" do
+      describe "#transpose" do
         before(:each) do
           @table = Table.new([
             %w{one 1111},
@@ -70,7 +74,7 @@ module Cucumber
         end
       end
       
-      describe ".rows_hash" do
+      describe "#rows_hash" do
                 
         it "should return a hash of the rows" do
           table = Table.new([
@@ -105,10 +109,10 @@ module Cucumber
       describe "replacing arguments" do
 
         before(:each) do
-          @table = table = Table.new([
+          @table = Table.new([
             %w{qty book},
             %w{<qty> <book>}
-            ])
+          ])
         end
 
         it "should return a new table with arguments replaced with values" do
@@ -118,6 +122,18 @@ module Cucumber
           table_with_replaced_args.hashes[0]['qty'].should == '5'
         end
 
+        it "should recognise when entire cell is delimited" do
+          @table.should have_text('<book>')
+        end
+
+        it "should recognise when just a subset of a cell is delimited" do
+          table = Table.new([
+            %w{qty book},
+            ['<qty>', "This is <who>'s book"]
+          ])
+          table.should have_text('<who>')
+        end
+
         it "should replace nil values with nil" do
           table_with_replaced_args = @table.arguments_replaced({'<book>' => nil})
 

data/spec/cucumber/ast/visitor_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/step_mother'
+require 'cucumber/ast'
+
+module Cucumber
+  module Ast
+    describe Visitor do
+      
+      it "should support checking scenario name matches regexps" do
+        visitor = Visitor.new(mock("step mother"))
+        scenario = Scenario.new(background=nil,
+          comment=Comment.new(""),
+          tags=Tags.new(0, []), 
+          line=99,
+          keyword="",
+          name="test name", 
+          steps=[])
+
+        visitor.options = {:name_regexps => [/name/]}
+        
+        visitor.matches_scenario_names?(scenario).should be_true
+      end
+      
+    end
+  end
+end
+

data/spec/cucumber/cli/configuration_spec.rb

@@ -234,15 +234,6 @@ END_OF_MESSAGE
         end
       end
 
-      xit "should strip gems when --backtrace is absent" do
-        config = Main.new(['--'])
-        begin
-          "x".should == "y"
-        rescue => e
-          e.backtrace[0].should == "#{__FILE__}:#{__LINE__ - 2}"
-        end
-      end
-
       after do
         Exception.cucumber_full_backtrace = false
       end
@@ -264,12 +255,12 @@ END_OF_MESSAGE
         
     end
 
-    it "should accept multiple --scenario options" do
+    it "should accept multiple --name options" do
       config = Configuration.new
-      config.parse!(['--scenario', "User logs in", '--scenario', "User signs up"])
+      config.parse!(['--name', "User logs in", '--name', "User signs up"])
       
-      config.options[:scenario_names].should include("User logs in")
-      config.options[:scenario_names].should include("User signs up")
+      config.options[:name_regexps].should include(/User logs in/)
+      config.options[:name_regexps].should include(/User signs up/)
     end
     
     it "should search for all features in the specified directory" do

data/spec/cucumber/cli/main_spec.rb

@@ -7,189 +7,91 @@ rescue ::LoadError
 end
 
 module Cucumber
-module Cli
-  describe Main do
-    before(:each) do
-      @out = StringIO.new
-      Kernel.stub!(:exit).and_return(nil)
-    end
-
-    describe "verbose mode" do
-      
+  module Cli
+    describe Main do
       before(:each) do
-        @empty_feature = Ast::Feature.new(nil, Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
-        Dir.stub!(:[])
+        @out = StringIO.new
+        Kernel.stub!(:exit).and_return(nil)
       end
 
-      it "should show ruby files required" do
-        @cli = Main.new(%w{--verbose --require example.rb}, @out)
-        @cli.stub!(:require)
+      describe "verbose mode" do
+      
+        before(:each) do
+          @empty_feature = Ast::Feature.new(nil, Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
+          Dir.stub!(:[])
+        end
+
+        it "should show ruby files required" do
+          @cli = Main.new(%w{--verbose --require example.rb}, @out)
+          @cli.stub!(:require)
         
-        @cli.execute!(Object.new.extend(StepMother))
+          @cli.execute!(Object.new.extend(StepMother))
         
-        @out.string.should include('example.rb')
-      end
+          @out.string.should include('example.rb')
+        end
       
-      it "should show feature files parsed" do
-        @cli = Main.new(%w{--verbose example.feature}, @out)
-        @cli.stub!(:require)
+        it "should show feature files parsed" do
+          @cli = Main.new(%w{--verbose example.feature}, @out)
+          @cli.stub!(:require)
         
-        Parser::FeatureParser.stub!(:new).and_return(mock("feature parser", :parse_file => @empty_feature))
+          Parser::FeatureParser.stub!(:new).and_return(mock("feature parser", :parse_file => @empty_feature))
           
-        @cli.execute!(Object.new.extend(StepMother))
+          @cli.execute!(Object.new.extend(StepMother))
 
-        @out.string.should include('example.feature')
-      end
+          @out.string.should include('example.feature')
+        end
       
-    end
+      end
 
-    describe "diffing" do
+      describe "diffing" do
 
-      before :each do
-        @configuration = mock('Configuration', :null_object => true)
-        Configuration.should_receive(:new).and_return(@configuration)
-        
-        @step_mother = mock('StepMother', :null_object => true)
+        before :each do
+          @configuration = mock('Configuration', :null_object => true)
+          Configuration.should_receive(:new).and_return(@configuration)
         
-        @cli = Main.new(nil, @out)
-      end
-      
-      it "uses Spec Differ::Default when diff is enabled" do
-        @configuration.should_receive(:diff_enabled?).and_return(true)
+          @step_mother = mock('StepMother', :null_object => true)
         
-        ::Spec::Expectations::Differs::Default.should_receive(:new)
-        
-        @cli.execute!(@step_mother)
-      end
-      
-      it "does not use Spec Differ::Default when diff is disabled" do
-        @configuration.should_receive(:diff_enabled?).and_return(false)
-        
-        ::Spec::Expectations::Differs::Default.should_not_receive(:new)
-        
-        @cli.execute!(@step_mother)
-      end
-      
-    end
-
-    describe "--format with class" do
-     
-     describe "in module" do
-
-        it "should resolve each module until it gets Formatter class" do
-          cli = Main.new(%w{--format ZooModule::MonkeyFormatterClass}, nil)
-          mock_module = mock('module')
-          Object.stub!(:const_defined?).and_return(true)
-          mock_module.stub!(:const_defined?).and_return(true)
-
-          f = stub('formatter', :null_object => true)
-
-          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))
-        end
-
-      end
-     
-      describe "exists and valid constructor" do
-     
-        before(:each) do
-          @mock_formatter_class = mock('formatter class')
-          Object.stub!(:const_get).and_return(@mock_formatter_class)
-          Object.stub!(:const_defined?).with('magical').and_return(true)
+          @cli = Main.new(nil, @out)
         end
+      
+        it "uses Spec Differ::Default when diff is enabled" do
+          @configuration.should_receive(:diff_enabled?).and_return(true)
         
-        xit "should create the formatter" do
-          cli = Main.new
-          mock_formatter = mock('magical formatter')
-          cli.parse_options!(%w{--format magical})
-
-          @mock_formatter_class.should_receive(:new)
-
-          cli.execute!(stub('step mother'), mock_executor, stub('features'))
-        end
-                
-        xit "should register the formatter with broadcaster" do
-          cli = Main.new
-          broadcaster = Broadcaster.new
-          mock_formatter = mock('magical formatter')
-          Broadcaster.stub!(:new).and_return(broadcaster, stub("output broadcaster", :register => nil))
-          @mock_formatter_class.stub!(:new).and_return(mock_formatter)
-          cli.parse_options!(%w{--format magical})
-
-          broadcaster.should_receive(:register).with(mock_formatter)
+          ::Spec::Expectations::Differs::Default.should_receive(:new)
         
-          cli.execute!(stub('step mother'), mock_executor, stub('features'))
+          @cli.execute!(@step_mother)
         end
       
-      end
-          
-      describe "exists but invalid constructor" do
-
-        before(:each) do
-          @out = StringIO.new
-          @error = StringIO.new
-          @cli = Main.new(@out, @error)
-          
-          mock_formatter_class = stub('formatter class')
-          mock_formatter_class.stub!(:new).and_raise("No such method")
-          Object.stub!(:const_get).and_return(mock_formatter_class)
-          Object.stub!(:const_defined?).with('exists_but_evil').and_return(true)
-          
-          @cli.parse_options!(%w{--format exists_but_evil}) 
-        end
+        it "does not use Spec Differ::Default when diff is disabled" do
+          @configuration.should_receive(:diff_enabled?).and_return(false)
         
-        xit "should show exception" do
-          Kernel.stub!(:exit)
-
-          @cli.execute!(stub('step mother'))
-
-          @error.string.should include("No such method")
-        end
+          ::Spec::Expectations::Differs::Default.should_not_receive(:new)
         
-        xit "should exit" do
-          Kernel.should_receive(:exit)
-
-          @cli.execute!(stub('step mother'), mock_executor, stub('features'))
+          @cli.execute!(@step_mother)
         end
-                
+      
       end
-          
-      describe "non-existent" do
 
-        before(:each) do
-          @out = StringIO.new
-          @error = StringIO.new
-          @cli = Main.new(%w{--format invalid}, @out, @error)
-        end
+      describe "--format with class" do
+     
+       describe "in module" do
 
-        xit "should display a format error" do
-          Kernel.stub!(:exit)
+          it "should resolve each module until it gets Formatter class" do
+            cli = Main.new(%w{--format ZooModule::MonkeyFormatterClass}, nil)
+            mock_module = mock('module')
+            Object.stub!(:const_defined?).and_return(true)
+            mock_module.stub!(:const_defined?).and_return(true)
 
-          @cli.execute!(stub('step mother'), mock_executor, stub('features'))
-          
-          @error.string.should include("Invalid format: invalid\n")
-        end
-        
-        xit "should display --help" do
-          Kernel.stub!(:exit)
+            f = stub('formatter', :null_object => true)
 
-          @cli.execute!(Object.new.extend(StepMother))
-          
-          @out.string.should include("Usage: cucumber")
-        end
+            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))
 
-        xit "should exit" do
-          Kernel.should_receive(:exit)
+            cli.execute!(Object.new.extend(StepMother))
+          end
 
-          @cli.execute!(stub('step mother'), mock_executor, stub('features'))
-        end
-        
+        end            
       end
-            
     end
-
   end
 end
-end