X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fhttp%2Frequest_builder_test.exs;h=27ca651bebb882bf8a9f9e4d222ad285aa390e74;hb=138a3c1fe48bbace79c0121d4571db3c2a827860;hp=a368999fff6e967f0612f86cfd456ec019b39d23;hpb=b6fd16d0a424f916b7338237a2972e595e404955;p=akkoma

diff --git a/test/http/request_builder_test.exs b/test/http/request_builder_test.exs
index a368999ff..27ca651be 100644
--- a/test/http/request_builder_test.exs
+++ b/test/http/request_builder_test.exs
@@ -1,22 +1,36 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.HTTP.RequestBuilderTest do
   use ExUnit.Case, async: true
+  use Pleroma.Tests.Helpers
+  alias Pleroma.Config
+  alias Pleroma.HTTP.Request
   alias Pleroma.HTTP.RequestBuilder
 
   describe "headers/2" do
+    clear_config([:http, :send_user_agent])
+
     test "don't send pleroma user agent" do
-      assert RequestBuilder.headers(%{}, []) == %{headers: []}
+      assert RequestBuilder.headers(%Request{}, []) == %Request{headers: []}
     end
 
     test "send pleroma user agent" do
-      send = Pleroma.Config.get([:http, :send_user_agent])
-      Pleroma.Config.put([:http, :send_user_agent], true)
+      Config.put([:http, :send_user_agent], true)
+      Config.put([:http, :user_agent], :default)
+
+      assert RequestBuilder.headers(%Request{}, []) == %Request{
+               headers: [{"user-agent", Pleroma.Application.user_agent()}]
+             }
+    end
 
-      on_exit(fn ->
-        Pleroma.Config.put([:http, :send_user_agent], send)
-      end)
+    test "send custom user agent" do
+      Config.put([:http, :send_user_agent], true)
+      Config.put([:http, :user_agent], "totally-not-pleroma")
 
-      assert RequestBuilder.headers(%{}, []) == %{
-               headers: [{"User-Agent", Pleroma.Application.user_agent()}]
+      assert RequestBuilder.headers(%Request{}, []) == %Request{
+               headers: [{"user-agent", "totally-not-pleroma"}]
              }
     end
   end
@@ -28,19 +42,19 @@ defmodule Pleroma.HTTP.RequestBuilderTest do
 
     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"}
                ]
-             ) == %{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{
         body: %Tesla.Multipart{
           boundary: _,
           content_type_params: [],
@@ -57,7 +71,7 @@ defmodule Pleroma.HTTP.RequestBuilderTest do
             }
           ]
         }
-      } = RequestBuilder.add_param(%{}, :file, "filename.png", "some-path/filename.png")
+      } = RequestBuilder.add_param(%Request{}, :file, "filename.png", "some-path/filename.png")
     end
 
     test "add key to body" do
@@ -69,7 +83,7 @@ defmodule Pleroma.HTTP.RequestBuilderTest do
             %Tesla.Multipart.Part{
               body: "\"someval\"",
               dispositions: [name: "somekey"],
-              headers: ["Content-Type": "application/json"]
+              headers: [{"content-type", "application/json"}]
             }
           ]
         }