aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishnu Atrai <vishnu.atrai@gmail.com>2012-01-05 21:33:45 +0530
committerVishnu Atrai <vishnu.atrai@gmail.com>2012-01-05 21:33:45 +0530
commitf04af7cf01975af3d1bb01d17145901e96873679 (patch)
tree8716751cdfd3795eba666fc2981e1385bc668713
parent44951c8d44bebbb94f7a19b043b3eddcbd8b4657 (diff)
downloadrails-f04af7cf01975af3d1bb01d17145901e96873679.tar.gz
rails-f04af7cf01975af3d1bb01d17145901e96873679.tar.bz2
rails-f04af7cf01975af3d1bb01d17145901e96873679.zip
ActiveSupport::Testing::Pending support for MiniTest only
-rw-r--r--activesupport/lib/active_support/testing/pending.rb34
1 files changed, 1 insertions, 33 deletions
diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb
index feac7bc347..510f80f32c 100644
--- a/activesupport/lib/active_support/testing/pending.rb
+++ b/activesupport/lib/active_support/testing/pending.rb
@@ -11,39 +11,7 @@ module ActiveSupport
@@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