cucumber 1.3.11 → 1.3.12

data/History.md

@@ -1,3 +1,6 @@
+## [v1.3.13](https://github.com/cucumber/cucumber/compare/v1.3.11...v1.3.12)
+* Use MultiTest to handle assertions library selection (@tooky)
+  * Adds full support for rails 4.1 / Minitest
 ## [v1.3.11](https://github.com/cucumber/cucumber/compare/v1.3.10...v1.3.11)
 * Add Ruby 2.1 Support ([#644](https://github.com/cucumber/cucumber/pull/644) @tooky, @chrismdp)
 

data/cucumber.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'diff-lcs', '>= 1.1.3'
   s.add_dependency 'gherkin', '~> 2.12'
   s.add_dependency 'multi_json', '>= 1.7.5', '< 2.0'
-  s.add_dependency 'multi_test', '>= 0.0.2'
+  s.add_dependency 'multi_test', '>= 0.1.1'
 
   s.add_development_dependency 'aruba', '~> 0.5.2'
   s.add_development_dependency 'json', '~> 1.7'

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '1.3.11'
+  VERSION       = '1.3.12'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/rb_support/rb_language.rb

@@ -5,18 +5,7 @@ require 'cucumber/rb_support/rb_step_definition'
 require 'cucumber/rb_support/rb_hook'
 require 'cucumber/rb_support/rb_transform'
 require 'cucumber/rb_support/snippet'
-
-begin
-  require 'rspec/expectations'
-rescue LoadError
-  begin
-    require 'spec/expectations'
-    require 'spec/runner/differs/default'
-    require 'ostruct'
-  rescue LoadError
-    require 'test/unit/assertions'
-  end
-end
+require 'multi_test'
 
 module Cucumber
   module RbSupport
@@ -56,22 +45,6 @@ module Cucumber
         @step_definitions = []
         RbDsl.rb_language = self
         @world_proc = @world_modules = nil
-        @assertions_module = find_best_assertions_module
-      end
-
-      def find_best_assertions_module
-        begin
-          ::RSpec::Matchers
-        rescue NameError
-          # RSpec >=1.2.4
-          begin
-            options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
-            Spec::Expectations.differ = Spec::Expectations::Differs::Default.new(options)
-            ::Spec::Matchers
-          rescue NameError
-            ::Test::Unit::Assertions
-          end
-        end
       end
 
       def step_matches(name_to_match, name_to_format)
@@ -145,7 +118,7 @@ module Cucumber
 
       def extend_world
         @current_world.extend(RbWorld)
-        @current_world.extend(@assertions_module)
+        MultiTest.extend_with_best_assertion_library(@current_world)
         (@world_modules || []).each do |mod|
           @current_world.extend(mod)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.3.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -88,7 +88,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -1002,7 +1002,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2291098061179658367
+      hash: -4582240401117440396
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1011,13 +1011,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2291098061179658367
+      hash: -4582240401117440396
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: cucumber-1.3.11
+summary: cucumber-1.3.12
 test_files:
 - features/assertions.feature
 - features/autoformat_profile_output.feature