From: kaniini <ariadne@dereferenced.org>
Date: Mon, 16 Sep 2019 07:39:58 +0000 (+0000)
Subject: Merge branch 'feature/delivery-tracking' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=17142a3720c55e8bb0595f1a1c2f128dfcf47d10;p=akkoma

Merge branch 'feature/delivery-tracking' into 'develop'

Track signed fetches of objects and use them for delete federation

See merge request pleroma/pleroma!1661
---

17142a3720c55e8bb0595f1a1c2f128dfcf47d10
diff --cc test/web/activity_pub/activity_pub_controller_test.exs
index 9b78fb72d,0bab555b5..f83b14452
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@@ -4,13 -4,11 +4,14 @@@
  
  defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
    use Pleroma.Web.ConnCase
 +  use Oban.Testing, repo: Pleroma.Repo
 +
    import Pleroma.Factory
    alias Pleroma.Activity
+   alias Pleroma.Delivery
    alias Pleroma.Instances
    alias Pleroma.Object
 +  alias Pleroma.Tests.ObanHelpers
    alias Pleroma.User
    alias Pleroma.Web.ActivityPub.ObjectView
    alias Pleroma.Web.ActivityPub.Relay
diff --cc test/web/activity_pub/publisher_test.exs
index c7d0dc3a5,0ef97464e..c7d1d05aa
--- a/test/web/activity_pub/publisher_test.exs
+++ b/test/web/activity_pub/publisher_test.exs
@@@ -3,9 -3,8 +3,9 @@@
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.ActivityPub.PublisherTest do
-   use Pleroma.DataCase
+   use Pleroma.Web.ConnCase
  
 +  import ExUnit.CaptureLog
    import Pleroma.Factory
    import Tesla.Mock
    import Mock