Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed

3 files changed, 35 insertions, 2 deletions

diff --git a/test/object_test.exs b/test/object_test.exs
index 9b4e6f0bf..c6b2bc399 100644
--- a/test/object_test.exs
+++ b/test/object_test.exs
@@ -177,6 +177,39 @@ defmodule Pleroma.ObjectTest do
 
       assert {:ok, []} == File.ls("#{uploads_dir}/#{path}")
     end
+
+    test "With custom base_url" do
+      Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+      Pleroma.Config.put([Pleroma.Upload, :base_url], "https://sub.domain.tld/dir/")
+
+      file = %Plug.Upload{
+        content_type: "image/jpg",
+        path: Path.absname("test/fixtures/image.jpg"),
+        filename: "an_image.jpg"
+      }
+
+      user = insert(:user)
+
+      {:ok, %Object{} = attachment} =
+        Pleroma.Web.ActivityPub.ActivityPub.upload(file, actor: user.ap_id)
+
+      %{data: %{"attachment" => [%{"url" => [%{"href" => href}]}]}} =
+        note = insert(:note, %{user: user, data: %{"attachment" => [attachment.data]}})
+
+      uploads_dir = Pleroma.Config.get!([Pleroma.Uploaders.Local, :uploads])
+
+      path = href |> Path.dirname() |> Path.basename()
+
+      assert {:ok, ["an_image.jpg"]} == File.ls("#{uploads_dir}/#{path}")
+
+      Object.delete(note)
+
+      ObanHelpers.perform(all_enqueued(worker: Pleroma.Workers.AttachmentsCleanupWorker))
+
+      assert Object.get_by_id(attachment.id) == nil
+
+      assert {:ok, []} == File.ls("#{uploads_dir}/#{path}")
+    end
   end
 
   describe "normalizer" do
diff --git a/test/runtime_test.exs b/test/runtime_test.exs
index f7b6f23d4..6bde608ae 100644
--- a/test/runtime_test.exs
+++ b/test/runtime_test.exs
@@ -6,6 +6,6 @@ defmodule Pleroma.RuntimeTest do
   use ExUnit.Case, async: true
 
   test "it loads custom runtime modules" do
-    assert Code.ensure_compiled?(RuntimeModule)
+    assert {:module, RuntimeModule} == Code.ensure_compiled(RuntimeModule)
   end
 end
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index f43de700d..ba3341327 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -19,7 +19,7 @@ defmodule HttpRequestMock do
     else
       error ->
         with {:error, message} <- error do
-          Logger.warn(message)
+          Logger.warn(to_string(message))
         end
 
         {_, _r} = error