diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-06-21 15:07:15 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-06-21 15:07:15 +0000 |
| commit | 9e4461438f8ce584b635aca35579c36537a340ca (patch) | |
| tree | 8c1b83901b2d7ee52d32eec792e6af1ca807e65f /activeresource/test/base_test.rb | |
| parent | eb2e30ef249051713d8122a784d8fbfa378e7ae1 (diff) | |
| download | rails-9e4461438f8ce584b635aca35579c36537a340ca.tar.gz rails-9e4461438f8ce584b635aca35579c36537a340ca.tar.bz2 rails-9e4461438f8ce584b635aca35579c36537a340ca.zip | |
Added proper handling of arrays. Closes #8537 [hasmanyjosh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7074 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activeresource/test/base_test.rb')
| -rw-r--r-- | activeresource/test/base_test.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/activeresource/test/base_test.rb b/activeresource/test/base_test.rb index 6c924447de..328d3ae133 100644 --- a/activeresource/test/base_test.rb +++ b/activeresource/test/base_test.rb @@ -9,6 +9,10 @@ class BaseTest < Test::Unit::TestCase @david = { :id => 2, :name => 'David' }.to_xml(:root => 'person') @addy = { :id => 1, :street => '12345 Street' }.to_xml(:root => 'address') @default_request_headers = { 'Content-Type' => 'application/xml' } + @rick = { :name => "Rick", :age => 25 }.to_xml(:root => "person") + @people = [{ :id => 1, :name => 'Matz' }, { :id => 2, :name => 'David' }].to_xml(:root => 'people') + @people_david = [{ :id => 2, :name => 'David' }].to_xml(:root => 'people') + @addresses = [{ :id => 1, :street => '12345 Street' }].to_xml(:root => 'addresses') ActiveResource::HttpMock.respond_to do |mock| mock.get "/people/1.xml", {}, @matz @@ -18,9 +22,9 @@ class BaseTest < Test::Unit::TestCase mock.delete "/people/1.xml", {}, nil, 200 mock.delete "/people/2.xml", {}, nil, 400 mock.get "/people/99.xml", {}, nil, 404 - mock.post "/people.xml", {}, "<person><name>Rick</name><age type='integer'>25</age></person>", 201, 'Location' => '/people/5.xml' - mock.get "/people.xml", {}, "<people>#{@matz}#{@david}</people>" - mock.get "/people/1/addresses.xml", {}, "<addresses>#{@addy}</addresses>" + mock.post "/people.xml", {}, @rick, 201, 'Location' => '/people/5.xml' + mock.get "/people.xml", {}, @people + mock.get "/people/1/addresses.xml", {}, @addresses mock.get "/people/1/addresses/1.xml", {}, @addy mock.get "/people/1/addresses/2.xml", {}, nil, 404 mock.get "/people/2/addresses/1.xml", {}, nil, 404 @@ -225,7 +229,7 @@ class BaseTest < Test::Unit::TestCase end def test_find_all_by_from - ActiveResource::HttpMock.respond_to { |m| m.get "/companies/1/people.xml", {}, "<people>#{@david}</people>" } + ActiveResource::HttpMock.respond_to { |m| m.get "/companies/1/people.xml", {}, @people_david } people = Person.find(:all, :from => "/companies/1/people.xml") assert_equal 1, people.size @@ -233,7 +237,7 @@ class BaseTest < Test::Unit::TestCase end def test_find_all_by_from_with_options - ActiveResource::HttpMock.respond_to { |m| m.get "/companies/1/people.xml", {}, "<people>#{@david}</people>" } + ActiveResource::HttpMock.respond_to { |m| m.get "/companies/1/people.xml", {}, @people_david } people = Person.find(:all, :from => "/companies/1/people.xml") assert_equal 1, people.size @@ -241,7 +245,7 @@ class BaseTest < Test::Unit::TestCase end def test_find_all_by_symbol_from - ActiveResource::HttpMock.respond_to { |m| m.get "/people/managers.xml", {}, "<people>#{@david}</people>" } + ActiveResource::HttpMock.respond_to { |m| m.get "/people/managers.xml", {}, @people_david } people = Person.find(:all, :from => :managers) assert_equal 1, people.size |