[DRE-commits] [ruby-rspec-instafail] 76/126: Make instafail compatible with RSpec 2.8 -- https://github.com/rspec/rspec-core/commit/423af1314d3e75fae55d6021dd7ee57ffff54998

[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 dc2c9638dc360f65732a7eacf47e2f876331080f
Author: grosser <grosser.michael at gmail.com>
Date:   Sun Jan 8 15:05:45 2012 -0800

    Make instafail compatible with RSpec 2.8 -- https://github.com/rspec/rspec-core/commit/423af1314d3e75fae55d6021dd7ee57ffff54998
---
 lib/rspec/instafail/rspec_2.rb | 14 +++++++++++++-
 spec/rspec_2/Gemfile.lock      | 16 ++++++++--------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/lib/rspec/instafail/rspec_2.rb b/lib/rspec/instafail/rspec_2.rb
index f43cc10..70de874 100644
--- a/lib/rspec/instafail/rspec_2.rb
+++ b/lib/rspec/instafail/rspec_2.rb
@@ -8,8 +8,20 @@ module RSpec
 
       # do what BaseTextFormatter#dump_failures would do
       index = failed_examples.size - 1
-      dump_pending_example_fixed(example, index) || dump_failure(example, index)
+      _dump_pending_example(example, index)
       dump_backtrace(example)
     end
+
+    def _dump_pending_example(example, index)
+      if defined? pending_fixed? # > 2.8
+        if pending_fixed?(example)
+          dump_pending_fixed(example, index)
+        else
+          dump_failure(example, index)
+        end
+      else
+        dump_pending_example_fixed(example, index) || dump_failure(example, index)
+      end
+    end
   end
 end
diff --git a/spec/rspec_2/Gemfile.lock b/spec/rspec_2/Gemfile.lock
index 725a692..b68cba3 100644
--- a/spec/rspec_2/Gemfile.lock
+++ b/spec/rspec_2/Gemfile.lock
@@ -1,15 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
+    diff-lcs (1.1.3)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
+    rspec-mocks (2.8.0)
 
 PLATFORMS
   ruby

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