diff options
author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-05-17 19:30:43 -0400 |
---|---|---|
committer | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-05-18 00:34:09 -0400 |
commit | 6b4bbb427455ec1af6bdf0896a62129bd3c8c4aa (patch) | |
tree | 197f51ebb7b9b9c7987bb29aec73b7da9536cff7 /activeresource/test/cases/format_test.rb | |
parent | 4a9365ee18c055d970a5f8faaac9443a8bfb0d24 (diff) | |
download | rails-6b4bbb427455ec1af6bdf0896a62129bd3c8c4aa.tar.gz rails-6b4bbb427455ec1af6bdf0896a62129bd3c8c4aa.tar.bz2 rails-6b4bbb427455ec1af6bdf0896a62129bd3c8c4aa.zip |
updated all the tests in ARes to work with json
Diffstat (limited to 'activeresource/test/cases/format_test.rb')
-rw-r--r-- | activeresource/test/cases/format_test.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/activeresource/test/cases/format_test.rb b/activeresource/test/cases/format_test.rb index f8d33f99fa..174142ec52 100644 --- a/activeresource/test/cases/format_test.rb +++ b/activeresource/test/cases/format_test.rb @@ -51,28 +51,30 @@ class FormatTest < Test::Unit::TestCase end def test_formats_on_custom_element_method - for format in [ :json, :xml ] + [:json, :xml].each do |format| using_format(Person, format) do + david = (format == :json ? { :person => @david } : @david) ActiveResource::HttpMock.respond_to do |mock| - mock.get "/people/2.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david) - mock.get "/people/2/shallow.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david) + mock.get "/people/2.#{format}", { 'Accept' => ActiveResource::Formats[format].mime_type }, ActiveResource::Formats[format].encode(david) + mock.get "/people/2/shallow.#{format}", { 'Accept' => ActiveResource::Formats[format].mime_type }, ActiveResource::Formats[format].encode(david) end + remote_programmer = Person.find(2).get(:shallow) assert_equal @david[:id], remote_programmer['id'] assert_equal @david[:name], remote_programmer['name'] end - end - for format in [ :json, :xml ] - ryan = ActiveResource::Formats[format].encode({ :name => 'Ryan' }) + ryan_hash = { :name => 'Ryan' } + ryan_hash = (format == :json ? { :person => ryan_hash } : ryan_hash) + ryan = ActiveResource::Formats[format].encode(ryan_hash) using_format(Person, format) do remote_ryan = Person.new(:name => 'Ryan') - ActiveResource::HttpMock.respond_to.post "/people.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, {'Location' => "/people/5.#{format}"} + ActiveResource::HttpMock.respond_to.post "/people.#{format}", { 'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, { 'Location' => "/people/5.#{format}" } remote_ryan.save remote_ryan = Person.new(:name => 'Ryan') - ActiveResource::HttpMock.respond_to.post "/people/new/register.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, {'Location' => "/people/5.#{format}"} - assert_equal ActiveResource::Response.new(ryan, 201, {'Location' => "/people/5.#{format}"}), remote_ryan.post(:register) + ActiveResource::HttpMock.respond_to.post "/people/new/register.#{format}", { 'Content-Type' => ActiveResource::Formats[format].mime_type}, ryan, 201, { 'Location' => "/people/5.#{format}" } + assert_equal ActiveResource::Response.new(ryan, 201, { 'Location' => "/people/5.#{format}" }), remote_ryan.post(:register) end end end |