Skip to content
Browse files

Merge pull request #4322 from castlerock/minitest_pending

ActiveSupport::Testing::Pending support for MiniTest only
  • Loading branch information...
2 parents 7a08685 + f04af7c commit 38b0d6d6b9698292f1fdcc9ceb2b3d24ce627019 @josevalim josevalim committed Jan 5, 2012
Showing with 1 addition and 33 deletions.
  1. +1 −33 activesupport/lib/active_support/testing/pending.rb
View
34 activesupport/lib/active_support/testing/pending.rb
@@ -11,39 +11,7 @@ module Pending
@@at_exit = false
def pending(description = "", &block)
- 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
-
- begin
- block.call
- rescue Exception
- failed = true
- end
-
- flunk("<#{description}> did not fail.") unless failed
- end
-
- 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
- end
- end
- end
- end
+ skip(description.blank? ? nil : description)
end
end

0 comments on commit 38b0d6d

Please sign in to comment.
Something went wrong with that request. Please try again.