diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/activity_pub/mrf/simple_policy_test.exs | 26 | 
1 files changed, 21 insertions, 5 deletions
| diff --git a/test/web/activity_pub/mrf/simple_policy_test.exs b/test/web/activity_pub/mrf/simple_policy_test.exs index 7203b27da..df0f223f8 100644 --- a/test/web/activity_pub/mrf/simple_policy_test.exs +++ b/test/web/activity_pub/mrf/simple_policy_test.exs @@ -236,7 +236,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do        assert SimplePolicy.filter(remote_message) == {:ok, remote_message}      end -    test "has a matching host" do +    test "activity has a matching host" do        Config.put([:mrf_simple, :reject], ["remote.instance"])        remote_message = build_remote_message() @@ -244,13 +244,21 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do        assert SimplePolicy.filter(remote_message) == {:reject, nil}      end -    test "match with wildcard domain" do +    test "activity matches with wildcard domain" do        Config.put([:mrf_simple, :reject], ["*.remote.instance"])        remote_message = build_remote_message()        assert SimplePolicy.filter(remote_message) == {:reject, nil}      end + +    test "actor has a matching host" do +      Config.put([:mrf_simple, :reject], ["remote.instance"]) + +      remote_user = build_remote_user() + +      assert SimplePolicy.filter(remote_user) == {:reject, nil} +    end    end    describe "when :accept" do @@ -264,7 +272,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do        assert SimplePolicy.filter(remote_message) == {:ok, remote_message}      end -    test "is not empty but it doesn't have a matching host" do +    test "is not empty but activity doesn't have a matching host" do        Config.put([:mrf_simple, :accept], ["non.matching.remote"])        local_message = build_local_message() @@ -274,7 +282,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do        assert SimplePolicy.filter(remote_message) == {:reject, nil}      end -    test "has a matching host" do +    test "activity has a matching host" do        Config.put([:mrf_simple, :accept], ["remote.instance"])        local_message = build_local_message() @@ -284,7 +292,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do        assert SimplePolicy.filter(remote_message) == {:ok, remote_message}      end -    test "match with wildcard domain" do +    test "activity matches with wildcard domain" do        Config.put([:mrf_simple, :accept], ["*.remote.instance"])        local_message = build_local_message() @@ -293,6 +301,14 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do        assert SimplePolicy.filter(local_message) == {:ok, local_message}        assert SimplePolicy.filter(remote_message) == {:ok, remote_message}      end + +    test "actor has a matching host" do +      Config.put([:mrf_simple, :accept], ["remote.instance"]) + +      remote_user = build_remote_user() + +      assert SimplePolicy.filter(remote_user) == {:ok, remote_user} +    end    end    describe "when :avatar_removal" do | 
