diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-26 11:34:02 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-26 11:34:02 -0300 |
| commit | b3d40546923b194a89be0d9e00758864fa60b9e8 (patch) | |
| tree | 8acac475b371d61924c67a439704c82c61968fff /activesupport/lib/active_support/testing/pending.rb | |
| parent | aa5512299041efb923cd582fd26009a72b9ec670 (diff) | |
| parent | 2f59066470193c6219dfd958fc5d8096a2ddee68 (diff) | |
| download | rails-b3d40546923b194a89be0d9e00758864fa60b9e8.tar.gz rails-b3d40546923b194a89be0d9e00758864fa60b9e8.tar.bz2 rails-b3d40546923b194a89be0d9e00758864fa60b9e8.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activesupport/lib/active_support/testing/pending.rb')
| -rw-r--r-- | activesupport/lib/active_support/testing/pending.rb | 5 |
1 files changed, 5 insertions, 0 deletions
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 |