Merge remote-tracking branch 'upstream/master'

1 files changed, 41 insertions, 0 deletions

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..d4b0f236ee
--- /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, {}).spec.config
+        end
+
+        def test_url_host_no_db
+          spec = resolve 'mysql://foo?encoding=utf8'
+          assert_equal({
+            :adapter  => "mysql",
+            :database => "",
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+
+        def test_url_host_db
+          spec = resolve 'mysql://foo/bar?encoding=utf8'
+          assert_equal({
+            :adapter  => "mysql",
+            :database => "bar",
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+
+        def test_url_port
+          spec = resolve 'mysql://foo:123?encoding=utf8'
+          assert_equal({
+            :adapter  => "mysql",
+            :database => "",
+            :port     => 123,
+            :host     => "foo",
+            :encoding => "utf8" }, spec)
+        end
+      end
+    end
+  end
+end