api: Fix tests and finish discovery code

lib/matrix_sdk/api.rb

@@ -74,7 +74,7 @@ module MatrixSdk
       uri = URI("http#{ssl ? 's' : ''}://#{domain}")
       target_uri = nil
 
-      if !port.empty?
+      if !port.nil? && !port.empty?
         target_uri = URI("https://#{domain}:#{port}")
       elsif target == :server
         # Attempt SRV record discovery
@@ -96,7 +96,7 @@ module MatrixSdk
 
           target_uri = well_known['m.server'] if well_known && well_known.key?('m.server')
         else
-          target_uri = URI("https://#{target_uri.target}:#{target.port}")
+          target_uri = URI("https://#{target_uri.target}:#{target_uri.port}")
         end
       elsif %i[client identity].include? target_uri
         # Attempt .well-known discovery

test/api_creation_test.rb

@@ -21,35 +21,37 @@ class ApiTest < Test::Unit::TestCase
     assert_equal URI('https://matrix.example.com'), api.homeserver
   end
 
-  def test_creation_for_domain
+  def test_server_creation_for_domain
     ::Resolv::DNS
       .any_instance
       .expects(:getresource)
       .returns(Resolv::DNS::Resource::IN::SRV.new(10, 1, 443, 'matrix.example.com'))
+
     MatrixSdk::Api
       .expects(:new)
-      .with('https://example.com', address: 'matrix.example.com', port: 443)
+      .with(URI('https://example.com'), address: 'matrix.example.com', port: 443)
 
-    MatrixSdk::Api.new_for_domain 'example.com'
+    MatrixSdk::Api.new_for_domain 'example.com', target: :server
   end
 
-  def test_creation_for_missing_domain
+  def test_server_creation_for_missing_domain
     ::Resolv::DNS
       .any_instance
       .expects(:getresource)
       .raises(::Resolv::ResolvError)
+
     MatrixSdk::Api
       .expects(:new)
-      .with('https://example.com', address: 'example.com', port: 8448)
+      .with(URI('https://example.com'), address: 'example.com', port: 8448)
 
-    MatrixSdk::Api.new_for_domain 'example.com'
+    MatrixSdk::Api.new_for_domain 'example.com', target: :server
   end
 
-  def test_creation_for_domain_and_port
+  def test_server_creation_for_domain_and_port
     MatrixSdk::Api
       .expects(:new)
-      .with('https://example.com', address: 'example.com', port: 8448)
+      .with(URI('https://example.com'), address: 'example.com', port: 8448)
 
-    MatrixSdk::Api.new_for_domain 'example.com:8448'
+    MatrixSdk::Api.new_for_domain 'example.com:8448', target: :server
   end
 end