aslakhellesoy-cucumber 0.3.103 → 0.3.104

data/lib/cucumber/language_support/language_methods.rb

@@ -1,6 +1,12 @@
+require 'cucumber/step_match'
+
 module Cucumber
   module LanguageSupport
     module LanguageMethods
+      def create_step_match(step_definition, step_name, formatted_step_name, step_arguments)
+        StepMatch.new(step_definition, step_name, formatted_step_name, step_arguments)
+      end
+      
       def before(scenario)
         begin_scenario
         execute_before(scenario)
@@ -41,15 +47,6 @@ module Cucumber
         transform
       end
 
-      def add_step_definition(step_definition)
-        step_definitions << step_definition
-        step_definition
-      end
-
-      def step_definitions
-        @step_definitions ||= []
-      end
-
       def hooks_for(phase, scenario) #:nodoc:
         hooks[phase.to_sym].select{|hook| scenario.accept_hook?(hook)}
       end

data/lib/cucumber/rb_support/rb_language.rb

@@ -34,6 +34,7 @@ module Cucumber
       
       def initialize(step_mother)
         @step_mother = step_mother
+        @step_definitions = []
         RbDsl.rb_language = self
       end
 
@@ -56,10 +57,20 @@ module Cucumber
         end
       end
 
+      def step_matches(step_name, formatted_step_name)
+        @step_definitions.map do |step_definition|
+          step_definition.step_match(step_name, formatted_step_name)
+        end.compact
+      end
+
       def arguments_from(regexp, step_name)
         @regexp_argument_matcher.arguments_from(regexp, step_name)
       end
 
+      def unmatched_step_definitions
+        @step_definitions.select{|step_definition| !step_definition.matched?}
+      end
+
       def snippet_text(step_keyword, step_name, multiline_arg_class = nil)
         escaped = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
         escaped = escaped.gsub(PARAM_PATTERN, ESCAPED_PARAM_PATTERN)
@@ -94,7 +105,9 @@ module Cucumber
       end
 
       def register_rb_step_definition(regexp, proc)
-        add_step_definition(RbStepDefinition.new(self, regexp, proc))
+        step_definition = RbStepDefinition.new(self, regexp, proc)
+        @step_definitions << step_definition
+        step_definition
       end
 
       def build_rb_world_factory(world_modules, proc)
@@ -106,12 +119,12 @@ module Cucumber
         @world_modules += world_modules
       end
 
-      protected
-
       def load_code_file(code_file)
         require code_file # This will cause self.add_step_definition, self.add_hook, and self.add_transform to be called from RbDsl
       end
 
+      protected
+
       def begin_scenario
         begin_rb_scenario
       end

data/lib/cucumber/rb_support/rb_step_definition.rb

@@ -42,7 +42,9 @@ module Cucumber
       end
 
       def arguments_from(step_name)
-        RegexpArgumentMatcher.arguments_from(@regexp, step_name)
+        args = RegexpArgumentMatcher.arguments_from(@regexp, step_name)
+        @matched = true if args
+        args
       end
 
       def invoke(args)
@@ -56,6 +58,10 @@ module Cucumber
         end
       end
 
+      def matched?
+        @matched
+      end
+
       def file_colon_line
         @proc.file_colon_line
       end

data/lib/cucumber/step_match.rb

@@ -69,6 +69,10 @@ module Cucumber
       end
       s
     end
+
+    def inspect #:nodoc:
+      sprintf("#<%s:0x%x>", self.class, self.object_id)
+    end
   end
   
   class NoStepMatch #:nodoc:

data/lib/cucumber/step_mother.rb

@@ -38,16 +38,6 @@ module Cucumber
     end
   end
 
-  # Raised when 2 or more StepDefinition have the same Regexp
-  class Redundant < StandardError
-    def initialize(step_def_1, step_def_2)
-      message = "Multiple step definitions have the same Regexp:\n\n"
-      message << step_def_1.backtrace_line << "\n"
-      message << step_def_2.backtrace_line << "\n\n"
-      super(message)
-    end
-  end
-
   # This is the meaty part of Cucumber that ties everything together.
   class StepMother
     include Constantize
@@ -87,17 +77,12 @@ module Cucumber
     def load_code_file(step_def_file)
       if programming_language = programming_language_for(step_def_file)
         log.debug("  * #{step_def_file}\n")
-        step_definitions = programming_language.step_definitions_for(step_def_file)
-        register_step_definitions(step_definitions)
+        programming_language.load_code_file(step_def_file)
       else
         log.debug("  * #{step_def_file} [NOT SUPPORTED]\n")
       end
     end
 
-    def register_step_definitions(step_definitions)
-      step_definitions.each{|step_definition| register_step_definition(step_definition)}
-    end
-
     # Loads and registers programming language implementation.
     # Instances are cached, so calling with the same argument
     # twice will return the same instance.
@@ -152,7 +137,9 @@ module Cucumber
     end
 
     def step_match(step_name, formatted_step_name=nil) #:nodoc:
-      matches = step_definitions.map { |d| d.step_match(step_name, formatted_step_name) }.compact
+      matches = @programming_languages.map do |programming_language| 
+        programming_language.step_matches(step_name, formatted_step_name)
+      end.flatten
       raise Undefined.new(step_name) if matches.empty?
       matches = best_matches(step_name, matches) if matches.size > 1 && options[:guess]
       raise Ambiguous.new(step_name, matches, options[:guess]) if matches.size > 1
@@ -174,16 +161,11 @@ module Cucumber
         top_groups
       end
     end
-    
-    def clear! #:nodoc:
-      step_definitions.clear
-      hooks.clear
-      steps.clear
-      scenarios.clear
-    end
 
-    def step_definitions #:nodoc:
-      @step_definitions ||= []
+    def unmatched_step_definitions
+      @programming_languages.map do |programming_language| 
+        programming_language.unmatched_step_definitions
+      end.flatten
     end
 
     def snippet_text(step_keyword, step_name, multiline_arg_class) #:nodoc:
@@ -244,17 +226,6 @@ module Cucumber
 
     private
 
-    # Registers a StepDefinition. This can be a Ruby StepDefintion,
-    # or any other kind of object that implements the StepDefintion
-    # contract (API).
-    def register_step_definition(step_definition)
-      step_definitions.each do |already|
-        raise Redundant.new(already, step_definition) if already == step_definition
-      end
-      step_definitions << step_definition
-      step_definition
-    end
-
     def programming_language_for(step_def_file) #:nodoc:
       if ext = File.extname(step_def_file)[1..-1]
         return nil if @unsupported_programming_languages.index(ext)

data/lib/cucumber/version.rb

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

data/spec/cucumber/ast/background_spec.rb

@@ -20,17 +20,11 @@ module Cucumber
           $y = $x * n.to_i
         end
 
-        register
-
         @visitor = TreeWalker.new(@step_mother)
 
         @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/tree_walker_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Cucumber::Ast
+  describe TreeWalker do
+    it "should visit features" do
+      tw = TreeWalker.new(nil, [mock('listener', :before_visit_features => nil)], {})
+      tw.should_not_receive(:warn)
+      tw.visit_features(mock('features', :accept => nil))
+    end
+  end
+end

data/spec/cucumber/cli/options_spec.rb

@@ -193,6 +193,18 @@ module Cli
           options[:formats].should == [['progress', output_stream], ['html', 'features.html']]
         end
 
+        it "does not include STDOUT formatters from the profile if there is a STDOUT formatter in command line" do
+          given_cucumber_yml_defined_as({'html' => %w[--format html -o features.html --format pretty]})
+          options.parse!(%w{--format progress --profile html})
+          options[:formats].should == [['progress', output_stream], ['html', 'features.html']]
+        end
+
+        it "includes any STDOUT formatters from the profile if no STDOUT formatter was specified in command line" do
+          given_cucumber_yml_defined_as({'html' => %w[--format html]})
+          options.parse!(%w{--format rerun -o rerun.txt --profile html})
+          options[:formats].should == [['html', output_stream], ['rerun', 'rerun.txt']]
+        end
+
         it "assumes all of the formatters defined in the profile when none are specified on cmd line" do
           given_cucumber_yml_defined_as({'html' => %w[--format progress --format html -o features.html]})
           options.parse!(%w{--profile html})

data/spec/cucumber/formatter/html_spec.rb

@@ -37,7 +37,6 @@ module Cucumber
         dsl = Object.new 
         dsl.extend RbSupport::RbDsl
         dsl.instance_exec &step_defs
-        @step_mother.register_step_definitions(rb.step_definitions)
       end
       
       Spec::Matchers.define :have_css_node do |css, regexp|

data/spec/cucumber/rb_support/rb_step_definition_spec.rb

@@ -18,10 +18,6 @@ module Cucumber
         $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"
@@ -29,7 +25,6 @@ module Cucumber
         @dsl.Given /Inside/ do
           $inside = true
         end
-        register
 
         @step_mother.step_match("Outside").invoke(nil)
         $inside.should == true
@@ -42,7 +37,6 @@ module Cucumber
         @dsl.Given /Inside/ do |table|
           $inside = table.raw[0][0]
         end
-        register
 
         @step_mother.step_match("Outside").invoke(nil)
         $inside.should == 'inside'
@@ -52,7 +46,6 @@ module Cucumber
         @dsl.Given /Outside/ do
           Given 'Inside'
         end
-        register
 
         lambda do
           @step_mother.step_match('Outside').invoke(nil)
@@ -63,7 +56,6 @@ module Cucumber
         @dsl.Given /Outside/ do
           pending("Do me!")
         end
-        register
 
         lambda do
           @step_mother.step_match("Outside").invoke(nil)
@@ -77,7 +69,6 @@ module Cucumber
         @dsl.Given /Loud/ do
           announce 'wasup'
         end
-        register
         
         @step_mother.step_match("Loud").invoke(nil)
       end

data/spec/cucumber/step_mother_spec.rb

@@ -16,16 +16,11 @@ 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]"
@@ -34,14 +29,13 @@ 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:35:in `/Three (.*) mice/'
-spec/cucumber/step_mother_spec.rb:36:in `/Three blind (.*)/'
+spec/cucumber/step_mother_spec.rb:30:in `/Three (.*) mice/'
+spec/cucumber/step_mother_spec.rb:31:in `/Three blind (.*)/'
 
 You can run again with --guess to make Cucumber be more smart about it
 })
@@ -52,14 +46,13 @@ You can run again with --guess to make Cucumber be more smart about it
 
       @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:53:in `/Three (.*) mice/'
-spec/cucumber/step_mother_spec.rb:54:in `/Three cute (.*)/'
+spec/cucumber/step_mother_spec.rb:47:in `/Three (.*) mice/'
+spec/cucumber/step_mother_spec.rb:48:in `/Three cute (.*)/'
 
 })
     end
@@ -68,8 +61,7 @@ spec/cucumber/step_mother_spec.rb:54: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")
       end.should_not raise_error
@@ -79,8 +71,7 @@ spec/cucumber/step_mother_spec.rb:54: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
     
@@ -88,8 +79,7 @@ spec/cucumber/step_mother_spec.rb:54: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
 
@@ -98,8 +88,7 @@ spec/cucumber/step_mother_spec.rb:54: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
     
@@ -109,19 +98,10 @@ spec/cucumber/step_mother_spec.rb:54:in `/Three cute (.*)/'
       end.should raise_error(Undefined)
     end
 
-    it "should raise Redundant error when same regexp is registered twice" do
-      @dsl.Given(/Three (.*) mice/) {|disability|}
-      lambda do
-        @dsl.Given(/Three (.*) mice/) {|disability|}
-        register
-      end.should raise_error(Redundant)
-    end
-
     # http://railsforum.com/viewtopic.php?pid=93881
     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
@@ -133,7 +113,7 @@ spec/cucumber/step_mother_spec.rb:54: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:128:in `World'"]
+        e.backtrace.should == ["spec/cucumber/step_mother_spec.rb:108:in `World'"]
       end
     end
 
@@ -163,8 +143,8 @@ spec/cucumber/step_mother_spec.rb:54: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:160:in `World'
-spec/cucumber/step_mother_spec.rb:162:in `World'
+spec/cucumber/step_mother_spec.rb:140:in `World'
+spec/cucumber/step_mother_spec.rb:142:in `World'
 
 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.
@@ -175,8 +155,7 @@ 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)