summaryrefslogtreecommitdiff
path: root/test/http/request_builder_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-13 13:38:32 +0000
committerlain <lain@soykaf.club>2020-05-13 13:38:32 +0000
commitda550be066a15108ceef7874c3b2549c049a7f88 (patch)
tree8b9f59c625da682d54c462ee31c125bd4e444814 /test/http/request_builder_test.exs
parent6706cdce65f8b2dda55380dbfdad5e41e600af2d (diff)
parentfbe3d3aa5fe07a89c52a16b7bf0626e323366597 (diff)
downloadpleroma-da550be066a15108ceef7874c3b2549c049a7f88.tar.gz
pleroma-da550be066a15108ceef7874c3b2549c049a7f88.zip
Merge branch 'fix/1742-random-failing-tests' into 'develop'
Fix sporadically failing tests See merge request pleroma/pleroma!2524
Diffstat (limited to 'test/http/request_builder_test.exs')
-rw-r--r--test/http/request_builder_test.exs14
1 files changed, 5 insertions, 9 deletions
diff --git a/test/http/request_builder_test.exs b/test/http/request_builder_test.exs
index f11528c3f..fab909905 100644
--- a/test/http/request_builder_test.exs
+++ b/test/http/request_builder_test.exs
@@ -3,23 +3,19 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTTP.RequestBuilderTest do
- use ExUnit.Case, async: true
+ use ExUnit.Case
use Pleroma.Tests.Helpers
- alias Pleroma.Config
alias Pleroma.HTTP.Request
alias Pleroma.HTTP.RequestBuilder
describe "headers/2" do
- setup do: clear_config([:http, :send_user_agent])
- setup do: clear_config([:http, :user_agent])
-
test "don't send pleroma user agent" do
assert RequestBuilder.headers(%Request{}, []) == %Request{headers: []}
end
test "send pleroma user agent" do
- Config.put([:http, :send_user_agent], true)
- Config.put([:http, :user_agent], :default)
+ clear_config([:http, :send_user_agent], true)
+ clear_config([:http, :user_agent], :default)
assert RequestBuilder.headers(%Request{}, []) == %Request{
headers: [{"user-agent", Pleroma.Application.user_agent()}]
@@ -27,8 +23,8 @@ defmodule Pleroma.HTTP.RequestBuilderTest do
end
test "send custom user agent" do
- Config.put([:http, :send_user_agent], true)
- Config.put([:http, :user_agent], "totally-not-pleroma")
+ clear_config([:http, :send_user_agent], true)
+ clear_config([:http, :user_agent], "totally-not-pleroma")
assert RequestBuilder.headers(%Request{}, []) == %Request{
headers: [{"user-agent", "totally-not-pleroma"}]