Merge branch 'fix/1658-invite-send' into 'develop'

[akkoma] / test / http / adapter_helper / hackney_test.exs

diff --git a/test/http/adapter_helper/hackney_test.exs b/test/http/adapter_helper/hackney_test.exs
index 82f5a7883cc131f3bae8d633ef9ee03eb77a47c5..3f7e708e07731a8d5da46c0d335912c649a34f34 100644 (file)
--- a/test/http/adapter_helper/hackney_test.exs
+++ b/test/http/adapter_helper/hackney_test.exs
@@ -1,12 +1,11 @@
 # 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.AdapterHelper.HackneyTest do
-  use ExUnit.Case
+  use ExUnit.Case, async: true
   use Pleroma.Tests.Helpers
 
-  alias Pleroma.Config
   alias Pleroma.HTTP.AdapterHelper.Hackney
 
   setup_all do
@@ -15,16 +14,10 @@ defmodule Pleroma.HTTP.AdapterHelper.HackneyTest do
   end
 
   describe "options/2" do
-    clear_config([:http, :adapter]) do
-      Config.put([:http, :adapter], a: 1, b: 2)
-    end
+    setup do: clear_config([:http, :adapter], a: 1, b: 2)
 
     test "add proxy and opts from config", %{uri: uri} do
-      proxy = Config.get([:http, :proxy_url])
-      Config.put([:http, :proxy_url], "localhost:8123")
-      on_exit(fn -> Config.put([:http, :proxy_url], proxy) end)
-
-      opts = Hackney.options(uri)
+      opts = Hackney.options([proxy: "localhost:8123"], uri)
 
       assert opts[:a] == 1
       assert opts[:b] == 2