Skip to content

Commit

Permalink
Delegate pending to skip if Minitest is available
Browse files Browse the repository at this point in the history
  • Loading branch information
dhh committed Mar 31, 2011
1 parent 58c3ec1 commit 2867093
Showing 1 changed file with 25 additions and 21 deletions.
46 changes: 25 additions & 21 deletions activesupport/lib/active_support/testing/pending.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,36 @@ module Pending
@@at_exit = false

def pending(description = "", &block)
if description.is_a?(Symbol)
is_pending = $tags[description]
return block.call unless is_pending
end
if defined?(::MiniTest)
skip(description.blank? ? nil : description)
else
if description.is_a?(Symbol)
is_pending = $tags[description]
return block.call unless is_pending
end

if block_given?
failed = false
if block_given?
failed = false

begin
block.call
rescue Exception
failed = true
end
begin
block.call
rescue Exception
failed = true
end

flunk("<#{description}> did not fail.") unless failed
end
flunk("<#{description}> did not fail.") unless failed
end

caller[0] =~ (/(.*):(.*):in `(.*)'/)
@@pending_cases << "#{$3} at #{$1}, line #{$2}"
print "P"
caller[0] =~ (/(.*):(.*):in `(.*)'/)
@@pending_cases << "#{$3} at #{$1}, line #{$2}"
print "P"

@@at_exit ||= begin
at_exit do
puts "\nPending Cases:"
@@pending_cases.each do |test_case|
puts test_case
@@at_exit ||= begin
at_exit do
puts "\nPending Cases:"
@@pending_cases.each do |test_case|
puts test_case
end
end
end
end
Expand Down

0 comments on commit 2867093

Please sign in to comment.