diff options
| -rw-r--r-- | activeresource/lib/active_resource/base.rb | 1 | ||||
| -rw-r--r-- | activeresource/test/cases/base_test.rb | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index 911ae37b35..9442eba8af 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -665,6 +665,7 @@ module ActiveResource # # => /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 diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb index f813ce2181..18c732b2ab 100644 --- a/activeresource/test/cases/base_test.rb +++ b/activeresource/test/cases/base_test.rb @@ -477,7 +477,7 @@ class BaseTest < Test::Unit::TestCase 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 @@ class BaseTest < Test::Unit::TestCase 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) |