Move connection resoluion logic to it's own testable class.

2 files changed, 41 insertions, 34 deletions

diff --git a/activerecord/test/cases/connection_management_test.rb b/activerecord/test/cases/connection_management_test.rb
index 2ce61f214b..a1d1177289 100644
--- a/activerecord/test/cases/connection_management_test.rb
+++ b/activerecord/test/cases/connection_management_test.rb
@@ -25,40 +25,6 @@ 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.connection_url_to_hash 'postgres://foo?encoding=utf8'
-        assert_equal({
-          :adapter  => "postgresql",
-          :database => "",
-          :host     => "foo",
-          :encoding => "utf8" }, spec)
-      end
-
-      def test_url_host_db
-        spec = FakeBase.connection_url_to_hash 'postgres://foo/bar?encoding=utf8'
-        assert_equal({
-          :adapter  => "postgresql",
-          :database => "bar",
-          :host     => "foo",
-          :encoding => "utf8" }, spec)
-      end
-
-      def test_url_port
-        spec = FakeBase.connection_url_to_hash '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)
 
diff --git a/activerecord/test/cases/connection_specification/resolver_test.rb b/activerecord/test/cases/connection_specification/resolver_test.rb
new file mode 100644
index 0000000000..1ca9a00c85
--- /dev/null
+++ b/activerecord/test/cases/connection_specification/resolver_test.rb
@@ -0,0 +1,41 @@
+require "cases/helper"
+
+module ActiveRecord
+  class Base
+    class ConnectionSpecification
+      class ResolverTest < ActiveRecord::TestCase
+        def resolve(spec)
+          Resolver.new(spec, ActiveRecord::Base, {}).spec.config
+        end
+
+        def test_url_host_no_db
+          spec = resolve 'postgres://foo?encoding=utf8'
+          assert_equal({
+            :adapter  => "postgresql",
+            :database => "",
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+
+        def test_url_host_db
+          spec = resolve 'postgres://foo/bar?encoding=utf8'
+          assert_equal({
+            :adapter  => "postgresql",
+            :database => "bar",
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+
+        def test_url_port
+          spec = resolve 'postgres://foo:123?encoding=utf8'
+          assert_equal({
+            :adapter  => "postgresql",
+            :database => "",
+            :port     => 123,
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+      end
+    end
+  end
+end