diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/reverse_proxy/client/hackney_test.exs | 15 | ||||
| -rw-r--r-- | test/reverse_proxy/reverse_proxy_test.exs | 15 | ||||
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 6 | ||||
| -rw-r--r-- | test/web/admin_api/config_test.exs | 8 |
4 files changed, 2 insertions, 42 deletions
diff --git a/test/reverse_proxy/client/hackney_test.exs b/test/reverse_proxy/client/hackney_test.exs deleted file mode 100644 index 3c552dc83..000000000 --- a/test/reverse_proxy/client/hackney_test.exs +++ /dev/null @@ -1,15 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.ReverseProxy.Client.HackneyTest do - use Pleroma.ReverseProxyClientCase, client: Pleroma.ReverseProxy.Client.Hackney - - defp check_ref(ref) do - assert is_reference(ref) - end - - defp close(ref) do - Pleroma.ReverseProxy.Client.Hackney.close(ref) - end -end diff --git a/test/reverse_proxy/reverse_proxy_test.exs b/test/reverse_proxy/reverse_proxy_test.exs index a1adaedf6..b2f7932bf 100644 --- a/test/reverse_proxy/reverse_proxy_test.exs +++ b/test/reverse_proxy/reverse_proxy_test.exs @@ -301,21 +301,6 @@ defmodule Pleroma.ReverseProxyTest do describe "integration tests" do @describetag :integration - test "with hackney client", %{conn: conn} do - client = Pleroma.Config.get([Pleroma.ReverseProxy.Client]) - Pleroma.Config.put([Pleroma.ReverseProxy.Client], Pleroma.ReverseProxy.Client.Hackney) - - on_exit(fn -> - Pleroma.Config.put([Pleroma.ReverseProxy.Client], client) - end) - - conn = ReverseProxy.call(conn, "http://httpbin.org/stream-bytes/10") - - assert byte_size(conn.resp_body) == 10 - assert conn.state == :chunked - assert conn.status == 200 - end - test "with tesla client with gun adapter", %{conn: conn} do client = Pleroma.Config.get([Pleroma.ReverseProxy.Client]) Pleroma.Config.put([Pleroma.ReverseProxy.Client], Pleroma.ReverseProxy.Client.Tesla) diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 844cd0732..0472a3f6d 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -1551,8 +1551,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{"tuple" => [":method", "Pleroma.Captcha.Kocaptcha"]}, %{"tuple" => [":seconds_valid", 60]}, %{"tuple" => [":path", ""]}, - %{"tuple" => [":key1", nil]}, - %{"tuple" => [":partial_chain", "&:hackney_connect.partial_chain/1"]} + %{"tuple" => [":key1", nil]} ] } ] @@ -1568,8 +1567,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do %{"tuple" => [":method", "Pleroma.Captcha.Kocaptcha"]}, %{"tuple" => [":seconds_valid", 60]}, %{"tuple" => [":path", ""]}, - %{"tuple" => [":key1", nil]}, - %{"tuple" => [":partial_chain", "&:hackney_connect.partial_chain/1"]} + %{"tuple" => [":key1", nil]} ] } ] diff --git a/test/web/admin_api/config_test.exs b/test/web/admin_api/config_test.exs index 3190dc1c8..d41666ef3 100644 --- a/test/web/admin_api/config_test.exs +++ b/test/web/admin_api/config_test.exs @@ -238,14 +238,6 @@ defmodule Pleroma.Web.AdminAPI.ConfigTest do assert Config.from_binary(binary) == [key: "value"] end - test "keyword with partial_chain key" do - binary = - Config.transform([%{"tuple" => [":partial_chain", "&:hackney_connect.partial_chain/1"]}]) - - assert binary == :erlang.term_to_binary(partial_chain: &:hackney_connect.partial_chain/1) - assert Config.from_binary(binary) == [partial_chain: &:hackney_connect.partial_chain/1] - end - test "keyword" do binary = Config.transform([ |