projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'conversation-pagination' 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 5fda075f63a2cb9bb9f0a2d08807fc625f228ad5..3f7e708e07731a8d5da46c0d335912c649a34f34 100644
(file)
--- a/
test/http/adapter_helper/hackney_test.exs
+++ b/
test/http/adapter_helper/hackney_test.exs
@@
-6,7
+6,6
@@
defmodule Pleroma.HTTP.AdapterHelper.HackneyTest do
use ExUnit.Case, async: true
use Pleroma.Tests.Helpers
use ExUnit.Case, async: true
use Pleroma.Tests.Helpers
- alias Pleroma.Config
alias Pleroma.HTTP.AdapterHelper.Hackney
setup_all do
alias Pleroma.HTTP.AdapterHelper.Hackney
setup_all do
@@
-15,9
+14,7
@@
defmodule Pleroma.HTTP.AdapterHelper.HackneyTest do
end
describe "options/2" 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
opts = Hackney.options([proxy: "localhost:8123"], uri)
test "add proxy and opts from config", %{uri: uri} do
opts = Hackney.options([proxy: "localhost:8123"], uri)