Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
[akkoma] / test / web / ostatus / ostatus_test.exs
index baa8cac72bd729b21e018d90ce983f0f9ab15962..f3268e83d975448f1edbdd416df07d9fe226fe9b 100644 (file)
@@ -6,6 +6,11 @@ defmodule Pleroma.Web.OStatusTest do
   import Pleroma.Factory
   import ExUnit.CaptureLog
 
+  setup_all do
+    Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
+    :ok
+  end
+
   test "don't insert create notes twice" do
     incoming = File.read!("test/fixtures/incoming_note_activity.xml")
     {:ok, [activity]} = OStatus.handle_incoming(incoming)
@@ -337,7 +342,7 @@ defmodule Pleroma.Web.OStatusTest do
                %Pleroma.User.Info{
                  id: user.info.id,
                  ap_enabled: false,
-                 background: nil,
+                 background: %{},
                  banner: %{},
                  blocks: [],
                  deactivated: false,