From 7f5dbb020188eebfbfdf4860bbce4f1a8d66e06f Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 8 Sep 2020 18:35:07 +0300
Subject: changes after rebase

---
 .../force_bot_unlisted_policy_test.exs             | 60 ----------------------
 .../mrf/force_bot_unlisted_policy_test.exs         | 60 ++++++++++++++++++++++
 2 files changed, 60 insertions(+), 60 deletions(-)
 delete mode 100644 test/pleroma/web/activity_pub/force_bot_unlisted_policy_test.exs
 create mode 100644 test/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy_test.exs

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/force_bot_unlisted_policy_test.exs b/test/pleroma/web/activity_pub/force_bot_unlisted_policy_test.exs
deleted file mode 100644
index 86dd9ddae..000000000
--- a/test/pleroma/web/activity_pub/force_bot_unlisted_policy_test.exs
+++ /dev/null
@@ -1,60 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicyTest do
-  use Pleroma.DataCase
-  import Pleroma.Factory
-
-  alias Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy
-  @public "https://www.w3.org/ns/activitystreams#Public"
-
-  defp generate_messages(actor) do
-    {%{
-       "actor" => actor.ap_id,
-       "type" => "Create",
-       "object" => %{},
-       "to" => [@public, "f"],
-       "cc" => [actor.follower_address, "d"]
-     },
-     %{
-       "actor" => actor.ap_id,
-       "type" => "Create",
-       "object" => %{"to" => ["f", actor.follower_address], "cc" => ["d", @public]},
-       "to" => ["f", actor.follower_address],
-       "cc" => ["d", @public]
-     }}
-  end
-
-  test "removes from the federated timeline by nickname heuristics 1" do
-    actor = insert(:user, %{nickname: "annoying_ebooks@example.com"})
-
-    {message, except_message} = generate_messages(actor)
-
-    assert ForceBotUnlistedPolicy.filter(message) == {:ok, except_message}
-  end
-
-  test "removes from the federated timeline by nickname heuristics 2" do
-    actor = insert(:user, %{nickname: "cirnonewsnetworkbot@meow.cat"})
-
-    {message, except_message} = generate_messages(actor)
-
-    assert ForceBotUnlistedPolicy.filter(message) == {:ok, except_message}
-  end
-
-  test "removes from the federated timeline by actor type Application" do
-    actor = insert(:user, %{actor_type: "Application"})
-
-    {message, except_message} = generate_messages(actor)
-
-    assert ForceBotUnlistedPolicy.filter(message) == {:ok, except_message}
-  end
-
-  test "removes from the federated timeline by actor type Service" do
-    actor = insert(:user, %{actor_type: "Service"})
-
-    {message, except_message} = generate_messages(actor)
-
-    assert ForceBotUnlistedPolicy.filter(message) == {:ok, except_message}
-  end
-end
diff --git a/test/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy_test.exs b/test/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy_test.exs
new file mode 100644
index 000000000..86dd9ddae
--- /dev/null
+++ b/test/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy_test.exs
@@ -0,0 +1,60 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicyTest do
+  use Pleroma.DataCase
+  import Pleroma.Factory
+
+  alias Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy
+  @public "https://www.w3.org/ns/activitystreams#Public"
+
+  defp generate_messages(actor) do
+    {%{
+       "actor" => actor.ap_id,
+       "type" => "Create",
+       "object" => %{},
+       "to" => [@public, "f"],
+       "cc" => [actor.follower_address, "d"]
+     },
+     %{
+       "actor" => actor.ap_id,
+       "type" => "Create",
+       "object" => %{"to" => ["f", actor.follower_address], "cc" => ["d", @public]},
+       "to" => ["f", actor.follower_address],
+       "cc" => ["d", @public]
+     }}
+  end
+
+  test "removes from the federated timeline by nickname heuristics 1" do
+    actor = insert(:user, %{nickname: "annoying_ebooks@example.com"})
+
+    {message, except_message} = generate_messages(actor)
+
+    assert ForceBotUnlistedPolicy.filter(message) == {:ok, except_message}
+  end
+
+  test "removes from the federated timeline by nickname heuristics 2" do
+    actor = insert(:user, %{nickname: "cirnonewsnetworkbot@meow.cat"})
+
+    {message, except_message} = generate_messages(actor)
+
+    assert ForceBotUnlistedPolicy.filter(message) == {:ok, except_message}
+  end
+
+  test "removes from the federated timeline by actor type Application" do
+    actor = insert(:user, %{actor_type: "Application"})
+
+    {message, except_message} = generate_messages(actor)
+
+    assert ForceBotUnlistedPolicy.filter(message) == {:ok, except_message}
+  end
+
+  test "removes from the federated timeline by actor type Service" do
+    actor = insert(:user, %{actor_type: "Service"})
+
+    {message, except_message} = generate_messages(actor)
+
+    assert ForceBotUnlistedPolicy.filter(message) == {:ok, except_message}
+  end
+end
-- 
cgit v1.2.3