diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-20 16:52:56 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-20 16:54:21 -0700 |
| commit | c4a6109286909c394e8c5bfc471a1eb9de245d2b (patch) | |
| tree | c6801a160133bdee57c19b64625964dba266c943 /activesupport | |
| parent | 8e7a87d299483fce6af3be89e50deae43055a96f (diff) | |
| download | rails-c4a6109286909c394e8c5bfc471a1eb9de245d2b.tar.gz rails-c4a6109286909c394e8c5bfc471a1eb9de245d2b.tar.bz2 rails-c4a6109286909c394e8c5bfc471a1eb9de245d2b.zip | |
Got controller/mime_responds_test.rb running on the new base
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/pending.rb | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index 50e25ef740..bab2a401eb 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -32,6 +32,11 @@ module ActiveSupport include ActiveSupport::Testing::Default end + $tags = {} + def self.for_tag(tag) + yield if $tags[tag] + end + include ActiveSupport::Testing::SetupAndTeardown include ActiveSupport::Testing::Assertions include ActiveSupport::Testing::Deprecation diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb index d945c7e476..21134ff9e2 100644 --- a/activesupport/lib/active_support/testing/pending.rb +++ b/activesupport/lib/active_support/testing/pending.rb @@ -11,6 +11,11 @@ module ActiveSupport @@at_exit = false def pending(description = "", &block) + if description.is_a?(Symbol) + is_pending = $tags[description] + return block.call unless is_pending + end + if block_given? failed = false |