[DRE-commits] [ruby-rspec-instafail] 113/126: Fix invalid rspec version detection

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository ruby-rspec-instafail.

commit c449fdc5ec86e2208e8ec7f3a9295babf8b43205
Author: Ryan Hansen <ryan.hansen at octanner.com>
Date:   Fri Aug 14 13:30:54 2015 -0600

    Fix invalid rspec version detection
    
    Fixes grosser/rspec-instafail#20
---
 lib/rspec/instafail.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/rspec/instafail.rb b/lib/rspec/instafail.rb
index 05145a8..8be712d 100755
--- a/lib/rspec/instafail.rb
+++ b/lib/rspec/instafail.rb
@@ -4,14 +4,14 @@ module RSpec
   lib = File.expand_path(File.dirname(File.dirname(__FILE__)))
   $LOAD_PATH << lib unless $LOAD_PATH.include?(lib)
 
-  if defined?(::RSpec::Core) && ::RSpec::Core::Version::STRING >= '3.0.0'
-    require "rspec/instafail/rspec_3"
-  else
-    begin
+  if defined?(::RSpec::Core)
+    if ::RSpec::Core::Version::STRING >= '3.0.0'
+      require "rspec/instafail/rspec_3"
+    else
       require "rspec/instafail/rspec_2"
-    rescue LoadError # try rspec 1
-      require "rspec/instafail/rspec_1"
     end
+  else
+    require "rspec/instafail/rspec_1"
   end
 
   require 'rspec/instafail/version'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rspec-instafail.git