cucumber_factory 1.7.2 → 1.7.3

data/VERSION

@@ -1 +1 @@
-1.7.2
+1.7.3

data/cucumber_factory.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber_factory}
-  s.version = "1.7.2"
+  s.version = "1.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]

data/lib/cucumber/runtime_ext.rb

@@ -20,9 +20,11 @@ module Cucumber
     def step_match_with_factory_priority(*args)
       step_match_without_factory_priority(*args)
     rescue Ambiguous => e
-      matched_definitions = e.matches.collect(&:step_definition)
-      if matched_definitions.size == 2 && (Cucumber::Factory.step_definitions & matched_definitions).any?
-        (matched_definitions - Cucumber::Factory.step_definitions).first
+      non_factory_matches = e.matches.reject do |match|
+        Cucumber::Factory.step_definitions.include?(match.step_definition)
+      end
+      if non_factory_matches.size == 1
+        non_factory_matches.first
       else
         raise
       end

data/spec/runtime_ext_spec.rb

@@ -11,9 +11,11 @@ describe Cucumber::Runtime, 'extended with cucumber_factory' do
 
   describe 'step_match' do
 
-    it "should not raise an ambiguous step error and return the user step if the only other matching step is a factory step" do
+    it "should not raise an ambiguous step error and match the user step if the only other matching step is a factory step" do
       user_step = @main.Given(/^there is a movie with a funny tone/){}
-      @runtime.step_match('there is a movie with a funny tone').should == user_step
+      match = @runtime.step_match('there is a movie with a funny tone')
+      match.step_definition.should == user_step
+      match.should be_a(Cucumber::StepMatch)
     end
 
     it "should still raise an ambiguous step error if more than two non-factory steps match" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber_factory
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 7
-  - 2
-  version: 1.7.2
+  - 3
+  version: 1.7.3
 platform: ruby
 authors: 
 - Henning Koch