Merge commit 'mainstream/master'

Conflicts:

	activerecord/lib/active_record/base.rb
	railties/Rakefile
	railties/doc/guides/activerecord/association_basics.txt
	railties/doc/guides/debugging/debugging_rails_applications.txt
	railties/doc/guides/getting_started_with_rails/getting_started_with_rails.txt
	railties/doc/guides/index.txt
	railties/doc/guides/migrations/foreign_keys.txt
	railties/doc/guides/migrations/migrations.txt
	railties/doc/guides/migrations/writing_a_migration.txt
	railties/doc/guides/routing/routing_outside_in.txt

1 files changed, 10 insertions, 2 deletions

diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb
index 06f31f1b57..84bcf69219 100644
--- a/activeresource/test/connection_test.rb
+++ b/activeresource/test/connection_test.rb
@@ -168,12 +168,20 @@ class ConnectionTest < Test::Unit::TestCase
     assert_equal 200, response.code
   end
 
-  uses_mocha('test_timeout') do
+  uses_mocha('test_timeout, test_accept_http_header') do
     def test_timeout
       @http = mock('new Net::HTTP')
       @conn.expects(:http).returns(@http)
       @http.expects(:get).raises(Timeout::Error, 'execution expired')
-      assert_raises(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') }
+      assert_raise(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') }
+    end
+
+    def test_accept_http_header
+      @http = mock('new Net::HTTP')
+      @conn.expects(:http).returns(@http)
+      path = '/people/1.xml'
+      @http.expects(:get).with(path,  {'Accept' => 'application/xhtml+xml'}).returns(ActiveResource::Response.new(@matz, 200, {'Content-Type' => 'text/xhtml'}))
+      assert_nothing_raised(Mocha::ExpectationError) { @conn.get(path, {'Accept' => 'application/xhtml+xml'}) }
     end
   end