X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Factivity_pub%2Fmrf%2Fhellthread_policy_test.exs;h=916b95692f64d676558a1bbbdbb2cb1a156bfde3;hb=0f386110c6e15148ff1ff5ea3451885485fcb7ff;hp=b5bdd35ccc95f29237687923409833a16ce895b5;hpb=d943c90249e0a598e57a0dbdf41d387b53916092;p=akkoma

diff --git a/test/web/activity_pub/mrf/hellthread_policy_test.exs b/test/web/activity_pub/mrf/hellthread_policy_test.exs
index b5bdd35cc..916b95692 100644
--- a/test/web/activity_pub/mrf/hellthread_policy_test.exs
+++ b/test/web/activity_pub/mrf/hellthread_policy_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicyTest do
@@ -8,32 +8,49 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicyTest do
 
   import Pleroma.Web.ActivityPub.MRF.HellthreadPolicy
 
-  describe "hellthread filter tests" do
-    setup do
-      user = insert(:user)
-
-      message = %{
-        "actor" => user.ap_id,
-        "cc" => [user.follower_address],
-        "type" => "Create",
-        "to" => [
-          "https://www.w3.org/ns/activitystreams#Public",
-          "https://instace.tld/users/user1",
-          "https://instace.tld/users/user2",
-          "https://instace.tld/users/user3"
-        ]
-      }
-
-      [user: user, message: message]
-    end
+  setup do
+    user = insert(:user)
+
+    message = %{
+      "actor" => user.ap_id,
+      "cc" => [user.follower_address],
+      "type" => "Create",
+      "to" => [
+        "https://www.w3.org/ns/activitystreams#Public",
+        "https://instance.tld/users/user1",
+        "https://instance.tld/users/user2",
+        "https://instance.tld/users/user3"
+      ]
+    }
+
+    [user: user, message: message]
+  end
 
-    test "reject test", %{message: message} do
+  clear_config(:mrf_hellthread)
+
+  describe "reject" do
+    test "rejects the message if the recipient count is above reject_threshold", %{
+      message: message
+    } do
       Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 0, reject_threshold: 2})
 
       {:reject, nil} = filter(message)
     end
 
-    test "delist test", %{user: user, message: message} do
+    test "does not reject the message if the recipient count is below reject_threshold", %{
+      message: message
+    } do
+      Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 0, reject_threshold: 3})
+
+      assert {:ok, ^message} = filter(message)
+    end
+  end
+
+  describe "delist" do
+    test "delists the message if the recipient count is above delist_threshold", %{
+      user: user,
+      message: message
+    } do
       Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 2, reject_threshold: 0})
 
       {:ok, message} = filter(message)
@@ -41,10 +58,18 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicyTest do
       assert "https://www.w3.org/ns/activitystreams#Public" in message["cc"]
     end
 
-    test "threshold test", %{message: message} do
-      Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 0, reject_threshold: 3})
+    test "does not delist the message if the recipient count is below delist_threshold", %{
+      message: message
+    } do
+      Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 4, reject_threshold: 0})
 
-      {:ok, _} = filter(message)
+      assert {:ok, ^message} = filter(message)
     end
   end
+
+  test "excludes follower collection and public URI from threshold count", %{message: message} do
+    Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 0, reject_threshold: 3})
+
+    assert {:ok, ^message} = filter(message)
+  end
 end