Permalink
Browse files

- check prefix options in collection_path

  • Loading branch information...
1 parent 9363931 commit 823a8e6e66b6e63583f569fdbc2e9cffa9430bf8 @gramos gramos committed Sep 13, 2010
Showing with 8 additions and 1 deletion.
  1. +1 −0 activeresource/lib/active_resource/base.rb
  2. +7 −1 activeresource/test/cases/base_test.rb
@@ -665,6 +665,7 @@ def new_element_path(prefix_options = {})
# # => /posts/5/comments.xml?active=1
#
def collection_path(prefix_options = {}, query_options = nil)
+ check_prefix_options(prefix_options)
prefix_options, query_options = split_options(prefix_options) if query_options.nil?
"#{prefix(prefix_options)}#{collection_name}.#{format.extension}#{query_string(query_options)}"
end
@@ -477,7 +477,7 @@ def test_custom_element_path
def test_custom_element_path_without_required_prefix_param
assert_raise ActiveResource::MissingPrefixParam do
- assert_equal '/people/1/addresses/1.xml', StreetAddress.element_path(1)
+ StreetAddress.element_path(1)
end
end
@@ -519,6 +519,12 @@ def test_custom_element_path_with_prefix_and_parameters
assert_equal '/people/1/addresses/1.xml?type=work', StreetAddress.element_path(1, {:person_id => 1}, {:type => 'work'})
end
+ def test_custom_collection_path_without_required_prefix_param
+ assert_raise ActiveResource::MissingPrefixParam do
+ StreetAddress.collection_path
+ end
+ end
+
def test_custom_collection_path
assert_equal '/people/1/addresses.xml', StreetAddress.collection_path(:person_id => 1)
assert_equal '/people/1/addresses.xml', StreetAddress.collection_path('person_id' => 1)

0 comments on commit 823a8e6

Please sign in to comment.