Permalink
Browse files

Fix CHANGELOG order and add a brief description of the changes in the

Action Pack in the upgrading guide. [ci skip]
  • Loading branch information...
1 parent 46fcce9 commit a78ee05da102b85f45ecc1a6f230817430fe2aea @rafaelfranca rafaelfranca committed May 20, 2012
Showing with 7 additions and 3 deletions.
  1. +3 −3 actionpack/CHANGELOG.md
  2. +4 −0 guides/source/upgrading_ruby_on_rails.textile
View
@@ -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) ##
@@ -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.

0 comments on commit a78ee05

Please sign in to comment.