Permalink
Browse files

Merge pull request #1940 from dmathieu/missing_location

Provide a more explicit message when we try to redirect to a missing location
  • Loading branch information...
spastorino committed Jul 2, 2011
2 parents 908be47 + ac15bce commit 9d6e5e64dcd129132c3c565d0b6ead8c9bf45c2f
@@ -182,10 +182,12 @@ def build_named_route_call(records, inflection, options = {})
if record.is_a?(Symbol) || record.is_a?(String)
route << record
- else
+ elsif record
route << ActiveModel::Naming.route_key(record)
route = [route.join("_").singularize] if inflection == :singular
route << "index" if ActiveModel::Naming.uncountable?(record) && inflection == :plural
+ else
+ raise ArgumentError, "Nil location provided. Can't build URI."
end
route << routing_type(options)
@@ -87,6 +87,14 @@ def test_namespaced_model_with_nested_resources
end
end
+ def test_with_nil
+ with_test_routes do
+ assert_raise ArgumentError, "Nil location provided. Can't build URI." do
+ polymorphic_url(nil)
+ end
+ end
+ end
+
def test_with_record
with_test_routes do
@project.save
@@ -659,6 +659,13 @@ def test_using_hash_resource
assert_equal %Q[{"result":{"name":"david","id":13}}], @response.body
end
+ def test_using_hash_resource_with_post
+ @request.accept = "application/json"
+ assert_raise ArgumentError, "Nil location provided. Can't build URI." do
+ post :using_hash_resource
+ end
+ end
+
def test_using_resource_with_block
@request.accept = "*/*"
get :using_resource_with_block

0 comments on commit 9d6e5e6

Please sign in to comment.