Merge branch 'develop' into gun

[akkoma] / test / http / request_builder_test.exs

diff --git a/test/http/request_builder_test.exs b/test/http/request_builder_test.exs
index 27ca651bebb882bf8a9f9e4d222ad285aa390e74..f6eeac6c07c08c82196dda21f38da1e1e9bfbd75 100644 (file)
--- a/test/http/request_builder_test.exs
+++ b/test/http/request_builder_test.exs
@@ -1,5 +1,5 @@
 # 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.RequestBuilderTest do
@@ -11,6 +11,7 @@ defmodule Pleroma.HTTP.RequestBuilderTest do
 
   describe "headers/2" do
     clear_config([:http, :send_user_agent])
+    clear_config([:http, :user_agent])
 
     test "don't send pleroma user agent" do
       assert RequestBuilder.headers(%Request{}, []) == %Request{headers: []}
@@ -35,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{