Merge branch 'master' into refactoring-based-on-credo-and-dialyzer

test/mobilizon/service/activity_pub/activity_pub_test.exs

@@ -14,6 +14,7 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
   alias Mobilizon.Service.HTTPSignatures.Signature
   alias Mobilizon.Service.ActivityPub
   use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+  import Mock
 
   setup_all do
     HTTPoison.start()
@@ -110,7 +111,6 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
   end
 
   describe "deletion" do
-    # TODO: The delete activity it relayed and fetched once again (and then not found /o\)
     test "it creates a delete activity and deletes the original event" do
       event = insert(:event)
       event = Events.get_public_event_by_url_with_preload!(event.url)
@@ -123,6 +123,25 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
       assert Events.get_event_by_url(event.url) == nil
     end
 
+    test "it deletes the original event but only locally if needed" do
+      with_mock ActivityPub.Utils,
+        maybe_federate: fn _ -> :ok end,
+        lazy_put_activity_defaults: fn args -> args end do
+        event = insert(:event)
+        event = Events.get_public_event_by_url_with_preload!(event.url)
+        {:ok, delete, _} = ActivityPub.delete(event, false)
+
+        assert delete.data["type"] == "Delete"
+        assert delete.data["actor"] == event.organizer_actor.url
+        assert delete.data["object"] == event.url
+        assert delete.local == false
+
+        assert Events.get_event_by_url(event.url) == nil
+
+        assert_called(ActivityPub.Utils.maybe_federate(delete))
+      end
+    end
+
     test "it creates a delete activity and deletes the original comment" do
       comment = insert(:comment)
       comment = Events.get_comment_from_url_with_preload!(comment.url)

test/mobilizon/service/admin/action_log_service_test.exs

@@ -22,7 +22,7 @@ defmodule Mobilizon.Service.Admin.ActionLogServiceTest do
               %ActionLog{
                 target_type: "Elixir.Mobilizon.Reports.Report",
                 target_id: report_id,
-                action: "update",
+                action: :update,
                 actor: moderator
               }} = log_action(moderator, "update", report)
     end
@@ -35,7 +35,7 @@ defmodule Mobilizon.Service.Admin.ActionLogServiceTest do
               %ActionLog{
                 target_type: "Elixir.Mobilizon.Reports.Note",
                 target_id: note_id,
-                action: "create",
+                action: :create,
                 actor: moderator
               }} = log_action(moderator, "create", report)
     end