From: lain <lain@soykaf.club>
Date: Mon, 6 Apr 2020 11:59:01 +0000 (+0000)
Subject: Merge branch 'remake-remodel-2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=349b9d86dc25ae9514781ef2ac56953fa357a031;p=akkoma

Merge branch 'remake-remodel-2' into 'develop'

Ingestion Pipeline Revamp

See merge request pleroma/pleroma!2315
---

349b9d86dc25ae9514781ef2ac56953fa357a031
diff --cc test/notification_test.exs
index 7cfa40c51,b22c23861..837a9dacd
--- a/test/notification_test.exs
+++ b/test/notification_test.exs
@@@ -537,12 -455,9 +537,12 @@@ defmodule Pleroma.NotificationTest d
            "status" => "hey @#{other_user.nickname}!"
          })
  
-       {:ok, activity_two, _} = CommonAPI.favorite(activity_one.id, third_user)
+       {:ok, activity_two} = CommonAPI.favorite(third_user, activity_one.id)
  
 -      assert other_user not in Notification.get_notified_from_activity(activity_two)
 +      {enabled_receivers, _disabled_receivers} =
 +        Notification.get_notified_from_activity(activity_two)
 +
 +      assert other_user not in enabled_receivers
      end
  
      test "it does not send notification to mentioned users in announces" do