Merge branch 'master' of github.com:lifo/docrails

* 'master' of github.com:lifo/docrails: (57 commits)
  Made the defaults section a little more readable and more to the point, giving a overview of the possibilities.
  Added information about default values
  added .'s to headings in the initialization textile page
  s/ERb/ERB/g (part II)
  s/ERb/ERB/g
  Bump up erubis to 2.7.0
  Implicit actions named not_implemented can be rendered
  Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0
  default_executable is deprecated since rubygems 1.7.0
  Trivial fix to HTTP Digest auth MD5 example
  Moved Turn activation/dependency to railties
  fix typo
  Direct logging of Active Record to STDOUT so it's shown inline with the results in the console [DHH]
  Add using Turn with natural language test case names if the library is available (which it will be in Rails 3.1) [DHH]
  require turn only for minitest
  Use Turn to format all Rails tests and enable the natural language case names
  Improve docs.
  pass respond_with options to controller render when using a template for api navigation
  only try to display an api template in responders if the request is a get or there are no errors
  when using respond_with with an invalid resource and custom options, the default response status and error messages should be returned
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 11e8c63fa0..b760db42e2 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -46,7 +46,7 @@ module ActionDispatch
         expected_options.stringify_keys!
         msg = build_message(message, "The recognized options <?> did not match <?>, difference: <?>",
             request.path_parameters, expected_options, expected_options.diff(request.path_parameters))
-        assert_block(msg) { request.path_parameters == expected_options }
+        assert_equal(expected_options, request.path_parameters, msg)
       end
 
       # Asserts that the provided options can be used to generate the provided path.  This is the inverse of +assert_recognizes+.
@@ -84,11 +84,11 @@ module ActionDispatch
         found_extras = options.reject {|k, v| ! extra_keys.include? k}
 
         msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
-        assert_block(msg) { found_extras == extras }
+        assert_equal(extras, found_extras, msg)
 
         msg = build_message(message, "The generated path <?> did not match <?>", generated_path,
             expected_path)
-        assert_block(msg) { expected_path == generated_path }
+        assert_equal(expected_path, generated_path, msg)
       end
 
       # Asserts that path and options match both ways; in other words, it verifies that <tt>path</tt> generates