diff options
| author | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
|---|---|---|
| committer | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
| commit | 5e60e6571384a809598f3118fdc02dac1fd9d7b8 (patch) | |
| tree | 3cfccbc36f0133124181ab965480a1352d86ca79 /activeresource | |
| parent | 51a9703b1e80caa30d699f30615f023079874623 (diff) | |
| parent | 1a50cc31639f35fd82a4a24821b9fc49dc7eadc9 (diff) | |
| download | rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.gz rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.bz2 rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/test/cases/base_test.rb | 2 | ||||
| -rw-r--r-- | activeresource/test/cases/finder_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb index 35c3f4c6ef..4d036d73cc 100644 --- a/activeresource/test/cases/base_test.rb +++ b/activeresource/test/cases/base_test.rb @@ -52,7 +52,7 @@ class BaseTest < Test::Unit::TestCase :children => [{:name => 'Natacha'}]}, {:name => 'Milena', :children => []}]}]}.to_xml(:root => 'customer') - # - resource with yaml array of strings; for ActiveRecords using serialize :bar, Array + # - resource with yaml array of strings; for ARs using serialize :bar, Array @marty = <<-eof.strip <?xml version=\"1.0\" encoding=\"UTF-8\"?> <person> diff --git a/activeresource/test/cases/finder_test.rb b/activeresource/test/cases/finder_test.rb index 535b6f4198..1f52868966 100644 --- a/activeresource/test/cases/finder_test.rb +++ b/activeresource/test/cases/finder_test.rb @@ -50,7 +50,7 @@ class FinderTest < Test::Unit::TestCase :children => [{:name => 'Natacha'}]}, {:name => 'Milena', :children => []}]}]}.to_xml(:root => 'customer') - # - resource with yaml array of strings; for ActiveRecords using serialize :bar, Array + # - resource with yaml array of strings; for ARs using serialize :bar, Array @marty = <<-eof.strip <?xml version=\"1.0\" encoding=\"UTF-8\"?> <person> |