1 files changed, 41 insertions, 0 deletions
diff --git a/activerecord/test/cases/connection_management_test.rb b/activerecord/test/cases/connection_management_test.rb
index 85871aebdf..f554ceef35 100644
--- a/activerecord/test/cases/connection_management_test.rb
+++ b/activerecord/test/cases/connection_management_test.rb
@@ -25,6 +25,40 @@ module ActiveRecord
         assert ActiveRecord::Base.connection_handler.active_connections?
       end
 
+      class FakeBase < ActiveRecord::Base
+        def self.establish_connection spec
+          String === spec ? super : spec
+        end
+      end
+
+      def test_url_host_no_db
+        spec = FakeBase.establish_connection 'postgres://foo?encoding=utf8'
+        assert_equal({
+          :adapter  => "postgresql",
+          :database => "",
+          :host     => "foo",
+          :encoding => "utf8" }, spec)
+      end
+
+      def test_url_host_db
+        spec = FakeBase.establish_connection 'postgres://foo/bar?encoding=utf8'
+        assert_equal({
+          :adapter  => "postgresql",
+          :database => "bar",
+          :host     => "foo",
+          :encoding => "utf8" }, spec)
+      end
+
+      def test_url_port
+        spec = FakeBase.establish_connection 'postgres://foo:123?encoding=utf8'
+        assert_equal({
+          :adapter  => "postgresql",
+          :database => "",
+          :port     => 123,
+          :host     => "foo",
+          :encoding => "utf8" }, spec)
+      end
+
       def test_app_delegation
         manager = ConnectionManagement.new(@app)
 
@@ -77,6 +111,13 @@ module ActiveRecord
         @management.call(@env)
         assert ActiveRecord::Base.connection_handler.active_connections?
       end
+
+      test "proxy is polite to it's body and responds to it" do
+        body = Class.new(String) { def to_path; "/path"; end }.new
+        proxy = ConnectionManagement::Proxy.new(body)
+        assert proxy.respond_to?(:to_path)
+        assert_equal proxy.to_path, "/path"
+      end
     end
   end
 end