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

[akkoma] / test / http / request_builder_test.exs

diff --git a/test/http/request_builder_test.exs b/test/http/request_builder_test.exs
index f87ca11d38376f75895f04f0482884982b02d016..f11528c3feb5138cc4710f03cee047056e0f90f0 100644 (file)
--- a/test/http/request_builder_test.exs
+++ b/test/http/request_builder_test.exs
@@ -10,8 +10,8 @@ defmodule Pleroma.HTTP.RequestBuilderTest do
   alias Pleroma.HTTP.RequestBuilder
 
   describe "headers/2" do
-    clear_config([:http, :send_user_agent])
-    clear_config([:http, :user_agent])
+    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: []}
@@ -36,23 +36,6 @@ defmodule Pleroma.HTTP.RequestBuilderTest do
     end
   end
 
-  describe "add_optional_params/3" do
-    test "don't add if keyword is empty" do
-      assert RequestBuilder.add_optional_params(%{}, %{}, []) == %{}
-    end
-
-    test "add query parameter" do
-      assert RequestBuilder.add_optional_params(
-               %Request{},
-               %{query: :query, body: :body, another: :val},
-               [
-                 {:query, "param1=val1&param2=val2"},
-                 {:body, "some body"}
-               ]
-             ) == %Request{query: "param1=val1&param2=val2", body: "some body"}
-    end
-  end
-
   describe "add_param/4" do
     test "add file parameter" do
       %Request{