Merge branch 'develop' into activation-meta

[akkoma] / test / http_test.exs

diff --git a/test/http_test.exs b/test/http_test.exs
index 83c27f6e164d9c58066a308a91de578a1e758f22..d394bb94222770ef9217023e769a5e4888a1353c 100644 (file)
--- a/test/http_test.exs
+++ b/test/http_test.exs
@@ -1,9 +1,9 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.HTTPTest do
-  use ExUnit.Case
+  use ExUnit.Case, async: true
   use Pleroma.Tests.Helpers
   import Tesla.Mock
   alias Pleroma.HTTP
@@ -17,6 +17,9 @@ defmodule Pleroma.HTTPTest do
       } ->
         json(%{"my" => "data"})
 
+      %{method: :head, url: "http://example.com/hello"} ->
+        %Tesla.Env{status: 200, body: ""}
+
       %{method: :get, url: "http://example.com/hello"} ->
         %Tesla.Env{status: 200, body: "hello"}
 
@@ -27,6 +30,12 @@ defmodule Pleroma.HTTPTest do
     :ok
   end
 
+  describe "head/1" do
+    test "returns successfully result" do
+      assert HTTP.head("http://example.com/hello") == {:ok, %Tesla.Env{status: 200, body: ""}}
+    end
+  end
+
   describe "get/1" do
     test "returns successfully result" do
       assert HTTP.get("http://example.com/hello") == {
@@ -58,29 +67,4 @@ defmodule Pleroma.HTTPTest do
              }
     end
   end
-
-  describe "connection pools" do
-    @describetag :integration
-    clear_config(Pleroma.Gun.API) do
-      Pleroma.Config.put(Pleroma.Gun.API, Pleroma.Gun)
-    end
-
-    test "gun" 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)
-
-      options = [adapter: [pool: :federation]]
-
-      assert {:ok, resp} = HTTP.get("https://httpbin.org/user-agent", [], options)
-
-      assert resp.status == 200
-
-      state = Pleroma.Pool.Connections.get_state(:gun_connections)
-      assert state.conns["https:httpbin.org:443"]
-    end
-  end
 end