X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fhttp%2Fconnection_test.exs;h=25a2bac1c0b6464d7d99bb10665d1df4d8c02e60;hb=9f884a263904c8b243507d35b29da712a31fb444;hp=53ccbc9cd6171a89e6ecf7fae5ec11cb1a83735f;hpb=509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21;p=akkoma

diff --git a/test/http/connection_test.exs b/test/http/connection_test.exs
index 53ccbc9cd..25a2bac1c 100644
--- a/test/http/connection_test.exs
+++ b/test/http/connection_test.exs
@@ -1,19 +1,16 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.HTTP.ConnectionTest do
-  use ExUnit.Case
+  use ExUnit.Case, async: true
   use Pleroma.Tests.Helpers
+
   import ExUnit.CaptureLog
+
   alias Pleroma.Config
   alias Pleroma.HTTP.Connection
 
-  setup_all do
-    {:ok, _} = Registry.start_link(keys: :unique, name: Pleroma.Gun.API.Mock)
-    :ok
-  end
-
   describe "parse_host/1" do
     test "as atom to charlist" do
       assert Connection.parse_host(:localhost) == 'localhost'
@@ -51,31 +48,31 @@ defmodule Pleroma.HTTP.ConnectionTest do
   describe "parse_proxy/1 errors" do
     test "ip without port" do
       capture_log(fn ->
-        assert Connection.parse_proxy("127.0.0.1") == {:error, :error_parsing_proxy}
+        assert Connection.parse_proxy("127.0.0.1") == {:error, :invalid_proxy}
       end) =~ "parsing proxy fail \"127.0.0.1\""
     end
 
     test "host without port" do
       capture_log(fn ->
-        assert Connection.parse_proxy("localhost") == {:error, :error_parsing_proxy}
+        assert Connection.parse_proxy("localhost") == {:error, :invalid_proxy}
       end) =~ "parsing proxy fail \"localhost\""
     end
 
     test "host with bad port" do
       capture_log(fn ->
-        assert Connection.parse_proxy("localhost:port") == {:error, :error_parsing_port_in_proxy}
+        assert Connection.parse_proxy("localhost:port") == {:error, :invalid_proxy_port}
       end) =~ "parsing port in proxy fail \"localhost:port\""
     end
 
     test "ip with bad port" do
       capture_log(fn ->
-        assert Connection.parse_proxy("127.0.0.1:15.9") == {:error, :error_parsing_port_in_proxy}
+        assert Connection.parse_proxy("127.0.0.1:15.9") == {:error, :invalid_proxy_port}
       end) =~ "parsing port in proxy fail \"127.0.0.1:15.9\""
     end
 
     test "as tuple without port" do
       capture_log(fn ->
-        assert Connection.parse_proxy({:socks5, :localhost}) == {:error, :error_parsing_proxy}
+        assert Connection.parse_proxy({:socks5, :localhost}) == {:error, :invalid_proxy}
       end) =~ "parsing proxy fail {:socks5, :localhost}"
     end
 
@@ -115,28 +112,5 @@ defmodule Pleroma.HTTP.ConnectionTest do
 
       assert opts[:proxy] == {'example.com', 4321}
     end
-
-    test "default ssl adapter opts with connection" do
-      adapter = Application.get_env(:tesla, :adapter)
-      Application.put_env(:tesla, :adapter, Tesla.Adapter.Gun)
-      on_exit(fn -> Application.put_env(:tesla, :adapter, adapter) end)
-
-      uri = URI.parse("https://some-domain.com")
-
-      pid = Process.whereis(:federation)
-      :ok = Pleroma.Gun.Conn.open(uri, :gun_connections, genserver_pid: pid)
-
-      opts = Connection.options(uri)
-
-      assert opts[:certificates_verification]
-      tls_opts = opts[:tls_opts]
-      assert tls_opts[:verify] == :verify_peer
-      assert tls_opts[:depth] == 20
-      assert tls_opts[:reuse_sessions] == false
-
-      assert opts[:original] == "some-domain.com:443"
-      assert opts[:close_conn] == false
-      assert is_pid(opts[:conn])
-    end
   end
 end