diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-20 18:16:03 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-20 18:16:03 -0300 |
| commit | a78ee05da102b85f45ecc1a6f230817430fe2aea (patch) | |
| tree | 8962e84b5d40a16f7f45b6b8f89f115afe31f9c4 | |
| parent | 46fcce9a55207b15c42b0b274a74d20e783b702f (diff) | |
| download | rails-a78ee05da102b85f45ecc1a6f230817430fe2aea.tar.gz rails-a78ee05da102b85f45ecc1a6f230817430fe2aea.tar.bz2 rails-a78ee05da102b85f45ecc1a6f230817430fe2aea.zip | |
Fix CHANGELOG order and add a brief description of the changes in the
Action Pack in the upgrading guide. [ci skip]
| -rw-r--r-- | actionpack/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.textile | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 94b3490b80..1e6e84ea4a 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,8 @@ ## Rails 4.0.0 (unreleased) ## +* `assert_generates`, `assert_recognizes`, and `assert_routing` all raise + `Assertion` instead of `RoutingError` *David Chelimsky* + * URL path parameters with invalid encoding now raise ActionController::BadRequest. *Andrew White* * Malformed query and request parameter hashes now raise ActionController::BadRequest. *Andrew White* @@ -190,9 +193,6 @@ * `ActionView::Helpers::TextHelper#highlight` now defaults to the HTML5 `mark` element. *Brian Cardarella* -* `assert_generates`, `assert_recognizes`, and `assert_routing` all raise - `Assertion` instead of `RoutingError` *David Chelimsky* - ## Rails 3.2.3 (March 30, 2012) ## diff --git a/guides/source/upgrading_ruby_on_rails.textile b/guides/source/upgrading_ruby_on_rails.textile index 2b2e65c813..02407a5fe8 100644 --- a/guides/source/upgrading_ruby_on_rails.textile +++ b/guides/source/upgrading_ruby_on_rails.textile @@ -42,6 +42,10 @@ h4(#active_model4_0). ActiveModel Rails 4.0 has changed how errors attach with the ConfirmationValidator. Now when confirmation validations fail the error will be attached to <tt>:#{attribute}_confirmation</tt> instead of <tt>attribute</tt>. +h4(#action_pack4_0). ActionPack + +Rails 4.0 changed how <tt>assert_generates</tt>, <tt>assert_recognizes</tt>, and <tt>assert_routing</tt> work. Now all these assertions raise <tt>Assertion</tt> instead of <tt>RoutingError</tt>. + h3. Upgrading from Rails 3.1 to Rails 3.2 If your application is currently on any version of Rails older than 3.1.x, you should upgrade to Rails 3.1 before attempting an update to Rails 3.2. |