cucumber_priority 0.1.1 → 0.1.2

data/.gitignore

@@ -5,3 +5,4 @@ pkg
 .idea
 .rvmrc
 log/*.log
+.byebug_history

data/gemfiles/Gemfile.cucumber-2.3

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'cucumber', '~> 2.3.0'
+gem 'activesupport', '~> 4.2.0'
+gem 'rspec', '~> 3.0'

data/gemfiles/Gemfile.cucumber-2.3.lock

@@ -0,0 +1,55 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.5.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
+    cucumber (2.3.2)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 3.2.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
+    diff-lcs (1.2.5)
+    gherkin (3.2.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.8.4)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 4.2.0)
+  cucumber (~> 2.3.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.11.2

data/lib/cucumber_priority/support_code_ext.rb

@@ -2,31 +2,63 @@ module Cucumber
   class Runtime
     class SupportCode
 
-      def step_match_with_priority(*args)
-        step_match_without_priority(*args)
-      rescue Ambiguous => e
+      if method_defined?(:step_matches) || private_method_defined?(:step_matches)
+        # Cucumber 2.3 or higher has a single method #step_matches which returns an
+        # array of Cucumber::StepMatch objects.
+        # This method raises Cucumber::Ambiguous if the array has more than one element.
+
+        def step_matches_with_priority(*args)
+          step_matches_without_priority(*args)
+        rescue Ambiguous => e
+          resolve_ambiguity_through_priority(e)
+        end
+
+        alias_method_chain :step_matches, :priority
+
+      else
+        # Cucumber 2.1 or lower has a single method #step_match which returns a
+        # single Cucumber::StepMatch.
+        # This method raises Cucumber::Ambigiuous if there are two or more matches.
+
+        def step_match_with_priority(*args)
+          step_match_without_priority(*args)
+        rescue Ambiguous => e
+          resolve_ambiguity_through_priority(e).first
+        end
+
+        alias_method_chain :step_match, :priority
+
+        # This method doesn't exist in old Cucumbers.
+        # We define it so our specs have a unified API to match steps.
+        def step_matches(*args)
+          [step_match(*args)]
+        end
+
+      end
+
+      private
+
+      def resolve_ambiguity_through_priority(e)
         overridable, overriding = e.matches.partition { |match|
           match.step_definition.overridable?
         }
         if overriding.size > 1
           # If we have more than one overriding step definitions,
           # this is an ambiguity error
-          raise
+          raise e
         elsif overriding.size == 1
           # If our ambiguity is due to another overridable step,
           # we can use the overriding step
-          overriding.first
+          overriding
         elsif overriding.size == 0
           # If we have multiple overridable steps, we use the one
           # with the highest priority.
           overridable.sort_by { |match|
-            match.step_definition.priority
-          }.last
+            - match.step_definition.priority
+          }
         end
       end
 
-      alias_method_chain :step_match, :priority
-
     end
   end
 end

data/lib/cucumber_priority/version.rb

@@ -1,3 +1,3 @@
 module CucumberPriority
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/cucumber_priority/cucumber_helper.rb

@@ -1,6 +1,6 @@
 def prepare_cucumber_example
   @runtime = Cucumber::Runtime.new
-  language = @runtime.load_programming_language('rb')
+  language = load_ruby_language
   scenario = double('scenario', :language => 'en', :accept_hook? => true)
   language.send(:begin_scenario, scenario)
   @world = language.current_world
@@ -9,6 +9,12 @@ def prepare_cucumber_example
   # @runtime.before(scenario)
 end
 
+def load_ruby_language
+  language = support_code.ruby if support_code.respond_to?(:ruby)
+  language ||= support_code.load_programming_language('rb')
+  language
+end
+
 def invoke_cucumber_step(step)
   support_code.step_match(step).invoke(nil) # nil means no multiline args
 end
@@ -16,3 +22,7 @@ end
 def support_code
   @runtime.instance_variable_get(:@support_code)
 end
+
+def first_step_match(*args)
+  support_code.send(:step_matches, *args).first
+end

data/spec/cucumber_priority/support_code_ext_spec.rb

@@ -8,12 +8,12 @@ describe Cucumber::Runtime, 'extended with cucumber_priority' do
     prepare_cucumber_example
   end
 
-  describe '#step_match' do
+  describe '#step_matches' do
 
     it 'returns an overriding step if the only other match is a overridable step' do
       overridable_step = @main.Given(/^there is a movie with a (.*?) tone$/){ }.overridable
       overriding_step = @main.Given(/^there is a movie with a funny tone$/){ }
-      match = support_code.step_match('there is a movie with a funny tone')
+      match = first_step_match('there is a movie with a funny tone')
       match.step_definition.should == overriding_step
       match.should be_a(Cucumber::StepMatch)
     end
@@ -23,7 +23,7 @@ describe Cucumber::Runtime, 'extended with cucumber_priority' do
       @main.Given(/^there is a movie with a [^ ]+ tone$/){}
       @main.Given(/^there is a movie with a funny tone$/){}
       expect do
-        support_code.step_match('there is a movie with a funny tone')
+        first_step_match('there is a movie with a funny tone')
       end.to raise_error(Cucumber::Ambiguous)
     end
 
@@ -31,7 +31,7 @@ describe Cucumber::Runtime, 'extended with cucumber_priority' do
       overridable_step = @main.Given(/^there is a movie with a (.*?) tone$/){ }.overridable
       higher_overridable_step = @main.Given(/^there is a movie with a [^ ]+ tone$/){ }.overridable(:priority => 5)
       lower_overridable_step = @main.Given(/^there is a movie with a [^ ]+ tone$/){ }.overridable(:priority => -5)
-      match = support_code.step_match('there is a movie with a funny tone')
+      match = first_step_match('there is a movie with a funny tone')
       match.step_definition.should == higher_overridable_step
       match.should be_a(Cucumber::StepMatch)
     end

data/spec/spec_helper.rb

@@ -2,3 +2,13 @@
 
 $: << File.join(File.dirname(__FILE__), "/../../lib" )
 require 'cucumber_priority'
+
+if defined?(RSpec)
+  RSpec.configure do |config|
+    if config.respond_to?(:expect_with)
+      config.expect_with(:rspec) do |c|
+        c.syntax = [:expect, :should]
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber_priority
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -64,6 +64,8 @@ files:
 - gemfiles/Gemfile.cucumber-1.3.lock
 - gemfiles/Gemfile.cucumber-2.1
 - gemfiles/Gemfile.cucumber-2.1.lock
+- gemfiles/Gemfile.cucumber-2.3
+- gemfiles/Gemfile.cucumber-2.3.lock
 - lib/cucumber_priority.rb
 - lib/cucumber_priority/ambiguous_error_ext.rb
 - lib/cucumber_priority/rb_step_definition_ext.rb