diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-14 20:19:56 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-14 20:19:56 +0300 |
commit | e4b12494d77e7a6920a408d62d5b8fe0f886a14d (patch) | |
tree | 5b58e0cfaf33dc2fccd809e887e1194baa6b1191 /test/http/request_builder_test.exs | |
parent | f1f588fd5271c0b3bf09df002a83dbb57c42bae0 (diff) | |
parent | e455ca3f3eee74db0b1e60550acf53bea915be3b (diff) | |
download | pleroma-e4b12494d77e7a6920a408d62d5b8fe0f886a14d.tar.gz pleroma-e4b12494d77e7a6920a408d62d5b8fe0f886a14d.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
Diffstat (limited to 'test/http/request_builder_test.exs')
-rw-r--r-- | test/http/request_builder_test.exs | 14 |
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"}] |