1 files changed, 21 insertions, 32 deletions
diff --git a/activerecord/test/cases/connection_management_test.rb b/activerecord/test/cases/connection_management_test.rb
index f554ceef35..fe1b40d884 100644
--- a/activerecord/test/cases/connection_management_test.rb
+++ b/activerecord/test/cases/connection_management_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+require "rack"
 
 module ActiveRecord
   module ConnectionAdapters
@@ -25,38 +26,25 @@ 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_connection_pool_per_pid
+        return skip('must support fork') unless Process.respond_to?(:fork)
 
-      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
+        object_id = ActiveRecord::Base.connection.object_id
 
-      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
+        rd, wr = IO.pipe
+
+        pid = fork {
+          rd.close
+          wr.write Marshal.dump ActiveRecord::Base.connection.object_id
+          wr.close
+          exit!
+        }
+
+        wr.close
 
-      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)
+        Process.waitpid pid
+        assert_not_equal object_id, Marshal.load(rd.read)
+        rd.close
       end
 
       def test_app_delegation
@@ -114,9 +102,10 @@ module ActiveRecord
 
       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"
+        app = lambda { |_| [200, {}, body] }
+        response_body = ConnectionManagement.new(app).call(@env)[2]
+        assert response_body.respond_to?(:to_path)
+        assert_equal response_body.to_path, "/path"
       end
     end
   end