diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-18 21:34:32 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-18 21:34:32 -0200 |
| commit | e21579f1d11983ab3296e530afafd836d6e29b1f (patch) | |
| tree | b1f7741ec097c58ae2dfa8ca8c06d6252fec0562 /activesupport/CHANGELOG.md | |
| parent | a739340d3c9e66814429af6f3f410c01ff86810a (diff) | |
| parent | 92da512125fb5aeb7d7418c80cdd0ead5aaf30bb (diff) | |
| download | rails-e21579f1d11983ab3296e530afafd836d6e29b1f.tar.gz rails-e21579f1d11983ab3296e530afafd836d6e29b1f.tar.bz2 rails-e21579f1d11983ab3296e530afafd836d6e29b1f.zip | |
Merge branch 'deprecate-pending'
Properly deprecate #pending from AS::TestCase. This has been previously
removed from master, and is now back with a deprecation instead, to avoid
people having tests breaking when upgrading an app.
Please check #4575 for more background.
Diffstat (limited to 'activesupport/CHANGELOG.md')
| -rw-r--r-- | activesupport/CHANGELOG.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index b55a706b2f..504ebcb2fe 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 4.0.0 (unreleased) ## +* Deprecate `ActiveSupport::TestCase#pending` method, use `skip` from MiniTest instead. *Carlos Antonio da Silva* + * `XmlMini.with_backend` now may be safely used with threads: Thread.new do @@ -270,8 +272,6 @@ * Add html_escape_once to ERB::Util, and delegate escape_once tag helper to it. *Carlos Antonio da Silva* -* 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* |