Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Diff compared routing options. Allow #assert_recognizes to take a sec…

…ond arg as a hash to specify optional request method [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4255 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 3900b36896f4e199eabd768e2df0e7b81c8071ad 1 parent 7bd6923
risk danger olson technoweenie authored
5 actionpack/CHANGELOG
View
@@ -1,5 +1,10 @@
*SVN*
+* Diff compared routing options. Allow #assert_recognizes to take a second arg as a hash to specify optional request method [Rick]
+
+ assert_recognizes({:controller => 'users', :action => 'index'}, 'users')
+ assert_recognizes({:controller => 'users', :action => 'create'}, {:path => 'users', :method => :post})
+
* Diff compared options with #assert_redirected_to [Rick]
* Add support in routes for semicolon delimited "subpaths", like /books/:id;:action [Jamis Buck]
27 actionpack/lib/action_controller/assertions.rb
View
@@ -141,17 +141,33 @@ def assert_template(expected = nil, message=nil)
end
# Asserts that the routing of the given path was handled correctly and that the parsed options match.
+ #
+ # assert_recognizes({:controller => 'items', :action => 'index'}, 'items')
+ #
+ # Pass a hash in the second argument to specify the request method. This is useful for routes
+ # requiring a specific method.
+ #
+ # assert_recognizes({:controller => 'items', :action => 'create'}, {:path => 'items', :method => :post})
+ #
def assert_recognizes(expected_options, path, extras={}, message=nil)
+ if path.is_a? Hash
+ request_method = path[:method]
+ path = path[:path]
+ else
+ request_method = nil
+ end
+
clean_backtrace do
ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
- request = recognized_request_for(path)
+ request = recognized_request_for(path, request_method)
expected_options = expected_options.clone
extras.each_key { |key| expected_options.delete key } unless extras.nil?
expected_options.stringify_keys!
- msg = build_message(message, "The recognized options <?> did not match <?>",
- request.path_parameters, expected_options)
+ routing_diff = expected_options.diff(request.path_parameters)
+ 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 }
end
end
@@ -332,12 +348,13 @@ def clean_backtrace(&block)
end
private
- def recognized_request_for(path)
+ def recognized_request_for(path, request_method = nil)
path = "/#{path}" unless path.first == '/'
# Assume given controller
request = ActionController::TestRequest.new({}, {}, nil)
- request.path = path
+ request.env["REQUEST_METHOD"] = request_method.to_s.upcase if request_method
+ request.path = path
ActionController::Routing::Routes.recognize!(request)
request
end
Please sign in to comment.
Something went wrong with that request. Please try again.