diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-21 12:24:55 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-21 12:24:55 -0800 |
| commit | 1620df78dff527b4fa3f7b204fa05d1b630aae17 (patch) | |
| tree | d5be2ca64e89134f5a68aa8bd31058e09e0cbdec /activesupport | |
| parent | 2d000328dfc0d4b297fb4bdcebc9af6c2fb559dc (diff) | |
| parent | c8504b1b56a040fef962f97de4f9038d0888db57 (diff) | |
| download | rails-1620df78dff527b4fa3f7b204fa05d1b630aae17.tar.gz rails-1620df78dff527b4fa3f7b204fa05d1b630aae17.tar.bz2 rails-1620df78dff527b4fa3f7b204fa05d1b630aae17.zip | |
Merge pull request #4575 from carlosantoniodasilva/remove-test-pending
Remove ActiveSupport::TestCase#pending, use `skip` instead
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/pending.rb | 20 |
3 files changed, 2 insertions, 22 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index c339e93808..02a989db22 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 4.0.0 (unreleased) ## +* Remove ActiveSupport::TestCase#pending method, use `skip` instead. *Carlos Antonio da Silva* + * Deprecates the compatibility method Module#local_constant_names, use Module#local_constants instead (which returns symbols). *fxn* diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index 4169557286..9a52c916ec 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -3,7 +3,6 @@ require 'active_support/testing/setup_and_teardown' require 'active_support/testing/assertions' require 'active_support/testing/deprecation' require 'active_support/testing/declarative' -require 'active_support/testing/pending' require 'active_support/testing/isolation' require 'active_support/testing/mochaing' require 'active_support/core_ext/kernel/reporting' @@ -40,7 +39,6 @@ module ActiveSupport include ActiveSupport::Testing::SetupAndTeardown include ActiveSupport::Testing::Assertions include ActiveSupport::Testing::Deprecation - include ActiveSupport::Testing::Pending extend ActiveSupport::Testing::Declarative # test/unit backwards compatibility methods diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb deleted file mode 100644 index 510f80f32c..0000000000 --- a/activesupport/lib/active_support/testing/pending.rb +++ /dev/null @@ -1,20 +0,0 @@ -# Some code from jeremymcanally's "pending" -# https://github.com/jeremymcanally/pending/tree/master - -module ActiveSupport - module Testing - module Pending - - unless defined?(Spec) - - @@pending_cases = [] - @@at_exit = false - - def pending(description = "", &block) - skip(description.blank? ? nil : description) - end - end - - end - end -end |