diff options
Diffstat (limited to 'test')
8 files changed, 22 insertions, 20 deletions
diff --git a/test/pleroma/conversation_test.exs b/test/pleroma/conversation_test.exs index 1a947606d..7f5732da0 100644 --- a/test/pleroma/conversation_test.exs +++ b/test/pleroma/conversation_test.exs @@ -184,7 +184,7 @@ defmodule Pleroma.ConversationTest do undo = %Activity{ id: "fake", data: %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_activity_id(), "actor" => note.data["actor"], "to" => [note.data["actor"]], "object" => note_id, diff --git a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs index 19e04d472..eaa85b154 100644 --- a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs +++ b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs @@ -13,10 +13,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.ActivityPub.IDs alias Pleroma.Web.ActivityPub.ObjectView alias Pleroma.Web.ActivityPub.Relay alias Pleroma.Web.ActivityPub.UserView - alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.CommonAPI alias Pleroma.Web.Endpoint alias Pleroma.Workers.ReceiverWorker @@ -831,7 +831,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do data = data - |> Map.put("id", Utils.generate_object_id()) + |> Map.put("id", IDs.generate_object_id()) |> Map.put("actor", actor.ap_id) |> Map.put("object", object) |> Map.put("cc", [ diff --git a/test/pleroma/web/activity_pub/activity_pub_test.exs b/test/pleroma/web/activity_pub/activity_pub_test.exs index f4023856c..cf3bc7b0e 100644 --- a/test/pleroma/web/activity_pub/activity_pub_test.exs +++ b/test/pleroma/web/activity_pub/activity_pub_test.exs @@ -13,6 +13,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do alias Pleroma.Object alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.ActivityPub.IDs alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.AdminAPI.AccountView alias Pleroma.Web.CommonAPI @@ -1228,7 +1229,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do target_account = insert(:user) content = "foobar" {:ok, activity} = CommonAPI.post(target_account, %{status: content}) - context = Utils.generate_context_id() + context = IDs.generate_context_id() reporter_ap_id = reporter.ap_id target_ap_id = target_account.ap_id diff --git a/test/pleroma/web/activity_pub/object_validators/article_note_validator_test.exs b/test/pleroma/web/activity_pub/object_validators/article_note_validator_test.exs index e408c85c3..40d3f6a18 100644 --- a/test/pleroma/web/activity_pub/object_validators/article_note_validator_test.exs +++ b/test/pleroma/web/activity_pub/object_validators/article_note_validator_test.exs @@ -6,7 +6,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNoteValidatorTest do use Pleroma.DataCase, async: true alias Pleroma.Web.ActivityPub.ObjectValidators.ArticleNoteValidator - alias Pleroma.Web.ActivityPub.Utils + alias Pleroma.Web.ActivityPub.IDs import Pleroma.Factory @@ -15,7 +15,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNoteValidatorTest do user = insert(:user) note = %{ - "id" => Utils.generate_activity_id(), + "id" => IDs.generate_activity_id(), "type" => "Note", "actor" => user.ap_id, "to" => [user.follower_address], diff --git a/test/pleroma/web/activity_pub/object_validators/like_validation_test.exs b/test/pleroma/web/activity_pub/object_validators/like_validation_test.exs index 55f67232e..03a8dee16 100644 --- a/test/pleroma/web/activity_pub/object_validators/like_validation_test.exs +++ b/test/pleroma/web/activity_pub/object_validators/like_validation_test.exs @@ -5,9 +5,9 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidationTest do use Pleroma.DataCase, async: true + alias Pleroma.Web.ActivityPub.IDs alias Pleroma.Web.ActivityPub.ObjectValidator alias Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator - alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.CommonAPI import Pleroma.Factory @@ -21,7 +21,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidationTest do "to" => [user.ap_id], "cc" => [], "type" => "Like", - "id" => Utils.generate_activity_id(), + "id" => IDs.generate_activity_id(), "object" => post_activity.data["object"], "actor" => user.ap_id, "context" => "a context" diff --git a/test/pleroma/web/activity_pub/utils_test.exs b/test/pleroma/web/activity_pub/utils_test.exs index ee3e1014e..1664881e9 100644 --- a/test/pleroma/web/activity_pub/utils_test.exs +++ b/test/pleroma/web/activity_pub/utils_test.exs @@ -8,6 +8,7 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do alias Pleroma.Object alias Pleroma.Repo alias Pleroma.User + alias Pleroma.Web.ActivityPub.IDs alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.AdminAPI.AccountView alias Pleroma.Web.CommonAPI @@ -459,7 +460,7 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do reporter = insert(:user) target_account = insert(:user) {:ok, activity} = CommonAPI.post(target_account, %{status: "foobar"}) - context = Utils.generate_context_id() + context = IDs.generate_context_id() content = "foobar" target_ap_id = target_account.ap_id diff --git a/test/support/builders/activity_builder.ex b/test/support/builders/activity_builder.ex index 7c4950bfa..201de63f2 100644 --- a/test/support/builders/activity_builder.ex +++ b/test/support/builders/activity_builder.ex @@ -5,7 +5,7 @@ defmodule Pleroma.Builders.ActivityBuilder do user = opts[:user] || Pleroma.Factory.insert(:user) activity = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_object_id(), "actor" => user.ap_id, "to" => ["https://www.w3.org/ns/activitystreams#Public"], "type" => "Create", diff --git a/test/support/factory.ex b/test/support/factory.ex index af4fff45b..93a297eab 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -85,7 +85,7 @@ defmodule Pleroma.Factory do "type" => "Note", "content" => text, "source" => text, - "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_object_id(), "actor" => user.ap_id, "to" => ["https://www.w3.org/ns/activitystreams#Public"], "published" => DateTime.utc_now() |> DateTime.to_iso8601(), @@ -142,7 +142,7 @@ defmodule Pleroma.Factory do data = %{ "type" => "Audio", - "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_object_id(), "artist" => "lain", "title" => text, "album" => "lain radio", @@ -161,7 +161,7 @@ defmodule Pleroma.Factory do audio = insert(:audio) data = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_activity_id(), "type" => "Listen", "actor" => audio.data["actor"], "to" => audio.data["to"], @@ -191,7 +191,7 @@ defmodule Pleroma.Factory do def tombstone_factory do data = %{ "type" => "Tombstone", - "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_object_id(), "formerType" => "Note", "deleted" => DateTime.utc_now() |> DateTime.to_iso8601() } @@ -205,7 +205,7 @@ defmodule Pleroma.Factory do dm = insert(:direct_note) data = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_activity_id(), "type" => "Create", "actor" => dm.data["actor"], "to" => dm.data["to"], @@ -230,7 +230,7 @@ defmodule Pleroma.Factory do data = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_activity_id(), "type" => "Create", "actor" => note.data["actor"], "to" => note.data["to"], @@ -252,7 +252,7 @@ defmodule Pleroma.Factory do article = insert(:article) data = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_activity_id(), "type" => "Create", "actor" => article.data["actor"], "to" => article.data["to"], @@ -295,7 +295,7 @@ defmodule Pleroma.Factory do data = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_activity_id(), "actor" => user.ap_id, "type" => "Like", "object" => object.data["id"], @@ -313,7 +313,7 @@ defmodule Pleroma.Factory do followed = insert(:user) data = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_activity_id(), "actor" => follower.ap_id, "type" => "Follow", "object" => followed.ap_id, @@ -332,7 +332,7 @@ defmodule Pleroma.Factory do state = attrs[:state] || "open" data = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "id" => Pleroma.Web.ActivityPub.IDs.generate_activity_id(), "actor" => user.ap_id, "type" => "Flag", "object" => [activity.actor, activity.data["id"]], |