Merge branch 'develop' into feature/bulk-confirmation

[akkoma] / test / support / factory.ex

diff --git a/test/support/factory.ex b/test/support/factory.ex
index e59d8324285aaf870b1dec8ea74294e5557bed75..fb82be0c4d4908b2cb32471a110d8ce9927a61a9 100644 (file)
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -31,6 +31,7 @@ defmodule Pleroma.Factory do
       nickname: sequence(:nickname, &"nick#{&1}"),
       password_hash: Pbkdf2.hash_pwd_salt("test"),
       bio: sequence(:bio, &"Tester Number #{&1}"),
+      discoverable: true,
       last_digest_emailed_at: NaiveDateTime.utc_now(),
       last_refreshed_at: NaiveDateTime.utc_now(),
       notification_settings: %Pleroma.User.NotificationSetting{},
@@ -441,58 +442,4 @@ defmodule Pleroma.Factory do
       phrase: "cofe"
     }
   end
-
-  def chat_factory(attrs \\ %{}) do
-    user = attrs[:user] || insert(:user)
-    recipient = attrs[:recipient] || insert(:user)
-
-    %Pleroma.Chat{
-      user_id: user.id,
-      recipient: recipient.ap_id
-    }
-  end
-
-  def chat_message_factory(attrs \\ %{}) do
-    text = sequence(:text, &"This is :moominmamma: chat message #{&1}")
-    chat = attrs[:chat] || insert(:chat)
-
-    data = %{
-      "type" => "ChatMessage",
-      "content" => text,
-      "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
-      "actor" => User.get_by_id(chat.user_id).ap_id,
-      "to" => [chat.recipient],
-      "published" => DateTime.utc_now() |> DateTime.to_iso8601()
-    }
-
-    %Pleroma.Object{
-      data: merge_attributes(data, Map.get(attrs, :data, %{}))
-    }
-  end
-
-  def chat_message_activity_factory(attrs \\ %{}) do
-    chat = attrs[:chat] || insert(:chat)
-    chat_message = attrs[:chat_message] || insert(:chat_message, chat: chat)
-
-    data_attrs = attrs[:data_attrs] || %{}
-    attrs = Map.drop(attrs, [:chat, :chat_message, :data_attrs])
-
-    data =
-      %{
-        "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
-        "type" => "Create",
-        "actor" => chat_message.data["actor"],
-        "to" => chat_message.data["to"],
-        "object" => chat_message.data["id"],
-        "published" => DateTime.utc_now() |> DateTime.to_iso8601()
-      }
-      |> Map.merge(data_attrs)
-
-    %Pleroma.Activity{
-      data: data,
-      actor: data["actor"],
-      recipients: data["to"]
-    }
-    |> Map.merge(attrs)
-  end
 end