From 20f690c53237128a0134d79f2a7472e7e256baf5 Mon Sep 17 00:00:00 2001 From: Diogo Peralta Cordeiro Date: Mon, 14 Mar 2022 18:33:47 +0000 Subject: [PATCH] [TESTS] Fix a couple of issues from last changes --- components/Notification/Entity/Attention.php | 2 - .../Person/Controller/PersonSettings.php | 6 +- .../tests/Controller/PersonSettingsTest.php | 14 ++--- .../Test/Fixtures/ActivityPubFixtures.php | 61 +++++++++++++++++++ .../friendica/activities/create_note.jsonld | 0 .../Fixtures}/friendica/objects/note.jsonld | 0 .../Fixtures}/friendica/objects/person.jsonld | 0 .../gnusocial/activities/create_note.jsonld | 14 ++--- .../gnusocial/activities/create_page.jsonld | 18 +++--- .../gnusocial/activities/create_reply.jsonld | 16 ++--- .../Fixtures}/gnusocial/context.jsonld | 0 .../Fixtures}/gnusocial/objects/group.jsonld | 20 +++--- .../Fixtures}/gnusocial/objects/note.jsonld | 8 +-- .../Fixtures}/gnusocial/objects/page.jsonld | 10 +-- .../Fixtures}/gnusocial/objects/person.jsonld | 20 +++--- .../Fixtures}/gnusocial/objects/reply.jsonld | 10 +-- .../lemmy/activities/block/block_user.jsonld | 0 .../activities/block/undo_block_user.jsonld | 0 .../lemmy/activities/community/add_mod.jsonld | 0 .../community/announce_create_page.jsonld | 0 .../activities/community/remove_mod.jsonld | 0 .../activities/community/report_page.jsonld | 0 .../community/update_community.jsonld | 0 .../create_or_update/create_note.jsonld | 0 .../create_or_update/create_page.jsonld | 0 .../create_private_message.jsonld | 0 .../create_or_update/update_page.jsonld | 0 .../activities/deletion/delete_page.jsonld | 0 .../deletion/delete_private_message.jsonld | 0 .../activities/deletion/remove_note.jsonld | 0 .../deletion/undo_delete_page.jsonld | 0 .../undo_delete_private_message.jsonld | 0 .../deletion/undo_remove_note.jsonld | 0 .../lemmy/activities/following/accept.jsonld | 0 .../lemmy/activities/following/follow.jsonld | 0 .../activities/following/undo_follow.jsonld | 0 .../activities/voting/dislike_page.jsonld | 0 .../lemmy/activities/voting/like_note.jsonld | 0 .../voting/undo_dislike_page.jsonld | 0 .../activities/voting/undo_like_note.jsonld | 0 .../lemmy/collections/group_followers.jsonld | 0 .../lemmy/collections/group_moderators.jsonld | 0 .../lemmy/collections/group_outbox.jsonld | 0 .../lemmy/collections/person_outbox.jsonld | 0 .../Fixtures}/lemmy/context.jsonld | 0 .../lemmy/objects/chat_message.jsonld | 0 .../Fixtures}/lemmy/objects/group.jsonld | 0 .../Fixtures}/lemmy/objects/instance.jsonld | 0 .../Fixtures}/lemmy/objects/note.jsonld | 0 .../Fixtures}/lemmy/objects/page.jsonld | 0 .../Fixtures}/lemmy/objects/person.jsonld | 0 .../Fixtures}/lemmy/objects/tombstone.jsonld | 0 .../activities/create_note_reply.jsonld | 0 .../lotide/activities/create_page.jsonld | 0 .../lotide/activities/delete_note.jsonld | 0 .../Fixtures}/lotide/objects/group.jsonld | 0 .../Fixtures}/lotide/objects/note.jsonld | 0 .../Fixtures}/lotide/objects/page.jsonld | 0 .../Fixtures}/lotide/objects/person.jsonld | 0 .../Fixtures}/lotide/objects/tombstone.jsonld | 0 .../mastodon/activities/create_note.jsonld | 0 .../mastodon/activities/delete.jsonld | 0 .../mastodon/activities/follow.jsonld | 0 .../mastodon/activities/undo_follow.jsonld | 0 .../Fixtures}/mastodon/objects/note.jsonld | 0 .../Fixtures}/mastodon/objects/person.jsonld | 0 .../pleroma/activities/create_note.jsonld | 0 .../pleroma/activities/delete.jsonld | 0 .../pleroma/activities/follow.jsonld | 0 .../pleroma/objects/chat_message.jsonld | 0 .../Fixtures}/pleroma/objects/note.jsonld | 0 .../Fixtures}/pleroma/objects/person.jsonld | 0 .../smithereen/activities/create_note.jsonld | 0 .../Fixtures}/smithereen/objects/note.jsonld | 0 .../smithereen/objects/person.jsonld | 0 .../Objects/GSActorGroupTest.php} | 14 +++-- .../Objects/GSActorPersonTest.php} | 14 +++-- plugins/ActivityPub/Util/Model/Note.php | 4 +- .../tests/fixtures/ActivityPubFixtures.php | 53 ---------------- src/Core/Form.php | 2 + src/Util/GNUsocialTestCase.php | 8 ++- tests/Controller/AdminTest.php | 2 +- tests/Controller/SecurityTest.php | 2 +- tests/Core/CacheTest.php | 8 +-- tests/Core/ControllerTest.php | 2 +- tests/Core/DB/DBTest.php | 6 +- tests/Core/DB/UpdateListenerTest.php | 2 +- tests/Core/EntityTest.php | 2 +- tests/Core/EventTest.php | 2 +- tests/Core/FormTest.php | 2 +- tests/Core/GSFileTest.php | 2 +- tests/Core/I18n/I18nTest.php | 6 +- tests/Core/RouterTest.php | 2 +- tests/fixtures/CoreFixtures.php | 4 +- 94 files changed, 176 insertions(+), 160 deletions(-) create mode 100644 plugins/ActivityPub/Test/Fixtures/ActivityPubFixtures.php rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/friendica/activities/create_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/friendica/objects/note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/friendica/objects/person.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/gnusocial/activities/create_note.jsonld (67%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/gnusocial/activities/create_page.jsonld (64%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/gnusocial/activities/create_reply.jsonld (62%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/gnusocial/context.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/gnusocial/objects/group.jsonld (63%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/gnusocial/objects/note.jsonld (73%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/gnusocial/objects/page.jsonld (71%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/gnusocial/objects/person.jsonld (63%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/gnusocial/objects/reply.jsonld (68%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/block/block_user.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/block/undo_block_user.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/community/add_mod.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/community/announce_create_page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/community/remove_mod.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/community/report_page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/community/update_community.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/create_or_update/create_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/create_or_update/create_page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/create_or_update/create_private_message.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/create_or_update/update_page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/deletion/delete_page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/deletion/delete_private_message.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/deletion/remove_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/deletion/undo_delete_page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/deletion/undo_delete_private_message.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/deletion/undo_remove_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/following/accept.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/following/follow.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/following/undo_follow.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/voting/dislike_page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/voting/like_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/voting/undo_dislike_page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/activities/voting/undo_like_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/collections/group_followers.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/collections/group_moderators.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/collections/group_outbox.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/collections/person_outbox.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/context.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/objects/chat_message.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/objects/group.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/objects/instance.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/objects/note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/objects/page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/objects/person.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lemmy/objects/tombstone.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lotide/activities/create_note_reply.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lotide/activities/create_page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lotide/activities/delete_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lotide/objects/group.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lotide/objects/note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lotide/objects/page.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lotide/objects/person.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/lotide/objects/tombstone.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/mastodon/activities/create_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/mastodon/activities/delete.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/mastodon/activities/follow.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/mastodon/activities/undo_follow.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/mastodon/objects/note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/mastodon/objects/person.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/pleroma/activities/create_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/pleroma/activities/delete.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/pleroma/activities/follow.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/pleroma/objects/chat_message.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/pleroma/objects/note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/pleroma/objects/person.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/smithereen/activities/create_note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/smithereen/objects/note.jsonld (100%) rename plugins/ActivityPub/{tests/fixtures => Test/Fixtures}/smithereen/objects/person.jsonld (100%) rename plugins/ActivityPub/{tests/Objects/GSGroupTest.php => Test/Objects/GSActorGroupTest.php} (78%) rename plugins/ActivityPub/{tests/Objects/GSPersonTest.php => Test/Objects/GSActorPersonTest.php} (78%) delete mode 100644 plugins/ActivityPub/tests/fixtures/ActivityPubFixtures.php diff --git a/components/Notification/Entity/Attention.php b/components/Notification/Entity/Attention.php index d5b9823fdb..91b6a22e2e 100644 --- a/components/Notification/Entity/Attention.php +++ b/components/Notification/Entity/Attention.php @@ -39,8 +39,6 @@ use App\Core\Entity; * @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org * @author Diogo Peralta Cordeiro <@diogo.site> * @copyright 2021-2022 Free Software Foundation, Inc http://www.fsf.org - * @author Diogo Peralta Cordeiro <@diogo.site> - * @copyright 2022 Free Software Foundation, Inc http://www.fsf.org * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ class Attention extends Entity diff --git a/components/Person/Controller/PersonSettings.php b/components/Person/Controller/PersonSettings.php index 94e853bcd1..74e924adcb 100644 --- a/components/Person/Controller/PersonSettings.php +++ b/components/Person/Controller/PersonSettings.php @@ -43,6 +43,7 @@ use App\Core\Event; use App\Core\Form; use function App\Core\I18n\_m; use App\Core\Log; +use App\Entity\Actor; use App\Util\Common; use App\Util\Exception\AuthenticationException; use App\Util\Exception\NicknameEmptyException; @@ -91,8 +92,9 @@ class PersonSettings extends Controller public function allSettings(Request $request, LanguageController $language): array { // Ensure the user is logged in and retrieve Actor object for given user - $user = Common::ensureLoggedIn(); - $actor = $user->getActor(); + $user = Common::ensureLoggedIn(); + // Must be persisted + $actor = DB::findOneBy(Actor::class, ['id' => $user->getId()]); $personal_form = ActorForms::personalInfo(request: $request, scope: $actor, target: $actor); $email_form = self::email($request); diff --git a/components/Person/tests/Controller/PersonSettingsTest.php b/components/Person/tests/Controller/PersonSettingsTest.php index 87681faddb..a3274c64a9 100644 --- a/components/Person/tests/Controller/PersonSettingsTest.php +++ b/components/Person/tests/Controller/PersonSettingsTest.php @@ -55,13 +55,13 @@ class PersonSettingsTest extends GNUsocialTestCase ]); $changed_user = DB::findOneBy(LocalUser::class, ['id' => $user->getId()]); $actor = $changed_user->getActor(); - static::assertSame($changed_user->getNickname(), 'form_test_user_new_nickname'); - static::assertSame($actor->getNickname(), 'form_test_user_new_nickname'); - static::assertSame($actor->getFullName(), 'Form User'); - static::assertSame($actor->getHomepage(), 'https://gnu.org'); - static::assertSame($actor->getBio(), 'I was born at a very young age'); - static::assertSame($actor->getLocation(), 'right here'); -// static::assertSame($changed_user->getPhoneNumber()->getNationalNumber(), '908555842'); + static::assertSame('form_test_user_new_nickname', $changed_user->getNickname()); + static::assertSame('form_test_user_new_nickname', $actor->getNickname()); + static::assertSame('Form User', $actor->getFullName()); + static::assertSame('https://gnu.org', $actor->getHomepage()); + static::assertSame('I was born at a very young age', $actor->getBio()); + static::assertSame('right here', $actor->getLocation()); +// static::assertSame('908555842', $changed_user->getPhoneNumber()->getNationalNumber()); } /** diff --git a/plugins/ActivityPub/Test/Fixtures/ActivityPubFixtures.php b/plugins/ActivityPub/Test/Fixtures/ActivityPubFixtures.php new file mode 100644 index 0000000000..70bf09c771 --- /dev/null +++ b/plugins/ActivityPub/Test/Fixtures/ActivityPubFixtures.php @@ -0,0 +1,61 @@ +hello, world.

", "mediaType": "text/html", "source": { @@ -35,18 +35,18 @@ }, "attachment": [], "tag": [], - "inConversation": "https://testv3.gnusocial.rocks/conversation/1337", + "inConversation": "https://instance.gnusocial.test/conversation/1337", "to": [ "https://www.w3.org/ns/activitystreams#Public" ], "cc": [ - "https://testv3.gnusocial.rocks/actor/42/subscribers" + "https://instance.gnusocial.test/actor/42/subscribers" ] }, "to": [ "https://www.w3.org/ns/activitystreams#Public" ], "cc": [ - "https://testv3.gnusocial.rocks/actor/42/subscribers" + "https://instance.gnusocial.test/actor/42/subscribers" ] } \ No newline at end of file diff --git a/plugins/ActivityPub/tests/fixtures/gnusocial/activities/create_page.jsonld b/plugins/ActivityPub/Test/Fixtures/gnusocial/activities/create_page.jsonld similarity index 64% rename from plugins/ActivityPub/tests/fixtures/gnusocial/activities/create_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/gnusocial/activities/create_page.jsonld index d3b5a1a455..40944a950b 100755 --- a/plugins/ActivityPub/tests/fixtures/gnusocial/activities/create_page.jsonld +++ b/plugins/ActivityPub/Test/Fixtures/gnusocial/activities/create_page.jsonld @@ -19,14 +19,14 @@ } } ], - "id": "https://testv3.gnusocial.rocks/activity/1338", + "id": "https://instance.gnusocial.test/activity/1338", "published": "2022-03-01T18:19:51+00:00", - "actor": "https://testv3.gnusocial.rocks/actor/42", + "actor": "https://instance.gnusocial.test/actor/42", "object": { "type": "Page", - "id": "https://testv3.gnusocial.rocks/object/note/1338", + "id": "https://instance.gnusocial.test/object/note/1338", "published": "2022-03-01T22:44:29+00:00", - "attributedTo": "https://testv3.gnusocial.rocks/actor/42", + "attributedTo": "https://instance.gnusocial.test/actor/42", "name": "hello, world.", "content": "

This is an interesting page.

", "mediaType": "text/html", @@ -36,20 +36,20 @@ }, "attachment": [], "tag": [], - "inConversation": "https://testv3.gnusocial.rocks/conversation/1338", + "inConversation": "https://instance.gnusocial.test/conversation/1338", "to": [ "https://www.w3.org/ns/activitystreams#Public" ], "cc": [ - "https://testv3.gnusocial.rocks/actor/42/subscribers", - "https://testv3.gnusocial.rocks/actor/21" + "https://instance.gnusocial.test/actor/42/subscribers", + "https://instance.gnusocial.test/actor/21" ] }, "to": [ "https://www.w3.org/ns/activitystreams#Public" ], "cc": [ - "https://testv3.gnusocial.rocks/actor/42/subscribers", - "https://testv3.gnusocial.rocks/actor/21" + "https://instance.gnusocial.test/actor/42/subscribers", + "https://instance.gnusocial.test/actor/21" ] } diff --git a/plugins/ActivityPub/tests/fixtures/gnusocial/activities/create_reply.jsonld b/plugins/ActivityPub/Test/Fixtures/gnusocial/activities/create_reply.jsonld similarity index 62% rename from plugins/ActivityPub/tests/fixtures/gnusocial/activities/create_reply.jsonld rename to plugins/ActivityPub/Test/Fixtures/gnusocial/activities/create_reply.jsonld index 0b4797c8da..53d58c5b3f 100755 --- a/plugins/ActivityPub/tests/fixtures/gnusocial/activities/create_reply.jsonld +++ b/plugins/ActivityPub/Test/Fixtures/gnusocial/activities/create_reply.jsonld @@ -19,14 +19,14 @@ } } ], - "id": "https://testv3.gnusocial.rocks/activity/1339", + "id": "https://instance.gnusocial.test/activity/1339", "published": "2022-03-01T20:58:48+00:00", - "actor": "https://testv3.gnusocial.rocks/actor/42", + "actor": "https://instance.gnusocial.test/actor/42", "object": { "type": "Note", - "id": "https://testv3.gnusocial.rocks/object/note/1339", + "id": "https://instance.gnusocial.test/object/note/1339", "published": "2022-03-01T21:00:16+00:00", - "attributedTo": "https://testv3.gnusocial.rocks/actor/42", + "attributedTo": "https://instance.gnusocial.test/actor/42", "content": "

yay ^^

", "mediaType": "text/html", "source": { @@ -35,19 +35,19 @@ }, "attachment": [], "tag": [], - "inReplyTo": "https://testv3.gnusocial.rocks/object/note/1338", - "inConversation": "https://testv3.gnusocial.rocks/conversation/1338", + "inReplyTo": "https://instance.gnusocial.test/object/note/1338", + "inConversation": "https://instance.gnusocial.test/conversation/1338", "to": [ "https://www.w3.org/ns/activitystreams#Public" ], "cc": [ - "https://testv3.gnusocial.rocks/actor/42/subscribers" + "https://instance.gnusocial.test/actor/42/subscribers" ] }, "to": [ "https://www.w3.org/ns/activitystreams#Public" ], "cc": [ - "https://testv3.gnusocial.rocks/actor/42/subscribers" + "https://instance.gnusocial.test/actor/42/subscribers" ] } \ No newline at end of file diff --git a/plugins/ActivityPub/tests/fixtures/gnusocial/context.jsonld b/plugins/ActivityPub/Test/Fixtures/gnusocial/context.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/gnusocial/context.jsonld rename to plugins/ActivityPub/Test/Fixtures/gnusocial/context.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/group.jsonld b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/group.jsonld similarity index 63% rename from plugins/ActivityPub/tests/fixtures/gnusocial/objects/group.jsonld rename to plugins/ActivityPub/Test/Fixtures/gnusocial/objects/group.jsonld index b63ab36cb7..ffe8cc22fb 100755 --- a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/group.jsonld +++ b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/group.jsonld @@ -20,23 +20,23 @@ } } ], - "id": "https://testv3.gnusocial.rocks/actor/21", - "inbox": "https://testv3.gnusocial.rocks/actor/21/inbox.json", - "outbox": "https://testv3.gnusocial.rocks/actor/21/outbox.json", - "following": "https://testv3.gnusocial.rocks/actor/21/subscriptions", - "followers": "https://testv3.gnusocial.rocks/actor/21/subscribers", - "liked": "https://testv3.gnusocial.rocks/actor/21/favourites", + "id": "https://instance.gnusocial.test/actor/21", + "inbox": "https://instance.gnusocial.test/actor/21/inbox.json", + "outbox": "https://instance.gnusocial.test/actor/21/outbox.json", + "following": "https://instance.gnusocial.test/actor/21/subscriptions", + "followers": "https://instance.gnusocial.test/actor/21/subscribers", + "liked": "https://instance.gnusocial.test/actor/21/favourites", "preferredUsername": "hackers", "publicKey": { - "id": "https://testv3.gnusocial.rocks/actor/2#public-key", - "owner": "https://testv3.gnusocial.rocks/actor/2", + "id": "https://instance.gnusocial.test/actor/2#public-key", + "owner": "https://instance.gnusocial.test/actor/2", "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoZyKL+GyJbTV/ilVBlzz\n8OL/UwNi3KpfV5kQwXU0pPcBbw6y2JOfWnKUT1CfiHG3ntiOFnc+wQfHZk4hRSE8\n9Xe/G5Y215xW+gqx/kjt2GOENqzSzYXdEZ5Qsx6yumZD/yb6VZK9Og0HjX2mpRs9\nbactY76w4BQVntjZ17gSkMhYcyPFZTAIe7QDkeSPk5lkXfTwtaB3YcJSbQ3+s7La\npeEgukQDkrLUIP6cxayKrgUl4fhHdpx1Yk4Bzd/1XkZCjeBca94lP1p2M12amI+Z\nOLSTuLyEiCcku8aN+Ms9plwATmIDaGvKFVk0YVtBHdIJlYXV0yIscab3bqyhsLBK\njwIDAQAB\n-----END PUBLIC KEY-----\n" }, "name": "Hackers!", "published": "2022-02-23T21:54:52+00:00", "updated": "2022-02-23T21:55:16+00:00", - "url": "https://testv3.gnusocial.rocks/!hackers", + "url": "https://instance.gnusocial.test/!hackers", "endpoints": { - "sharedInbox": "https://testv3.gnusocial.rocks/inbox.json" + "sharedInbox": "https://instance.gnusocial.test/inbox.json" } } \ No newline at end of file diff --git a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/note.jsonld b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/note.jsonld similarity index 73% rename from plugins/ActivityPub/tests/fixtures/gnusocial/objects/note.jsonld rename to plugins/ActivityPub/Test/Fixtures/gnusocial/objects/note.jsonld index 7939695143..00f32a9f4c 100755 --- a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/note.jsonld +++ b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/note.jsonld @@ -19,9 +19,9 @@ } } ], - "id": "https://testv3.gnusocial.rocks/object/note/1337", + "id": "https://instance.gnusocial.test/object/note/1337", "published": "2022-03-10T23:07:50+00:00", - "attributedTo": "https://testv3.gnusocial.rocks/actor/42", + "attributedTo": "https://instance.gnusocial.test/actor/42", "content": "

hello, world.

", "mediaType": "text/html", "source": { @@ -30,11 +30,11 @@ }, "attachment": [], "tag": [], - "inConversation": "https://testv3.gnusocial.rocks/conversation/1337", + "inConversation": "https://instance.gnusocial.test/conversation/1337", "to": [ "https://www.w3.org/ns/activitystreams#Public" ], "cc": [ - "https://testv3.gnusocial.rocks/actor/42/subscribers" + "https://instance.gnusocial.test/actor/42/subscribers" ] } \ No newline at end of file diff --git a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/page.jsonld b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/page.jsonld similarity index 71% rename from plugins/ActivityPub/tests/fixtures/gnusocial/objects/page.jsonld rename to plugins/ActivityPub/Test/Fixtures/gnusocial/objects/page.jsonld index 39cc9dc77f..7d58ec04c3 100755 --- a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/page.jsonld +++ b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/page.jsonld @@ -19,9 +19,9 @@ } } ], - "id": "https://testv3.gnusocial.rocks/object/note/1338", + "id": "https://instance.gnusocial.test/object/note/1338", "published": "2022-03-01T22:44:29+00:00", - "attributedTo": "https://testv3.gnusocial.rocks/actor/42", + "attributedTo": "https://instance.gnusocial.test/actor/42", "name": "hello, world.", "content": "

This is an interesting page.

", "mediaType": "text/html", @@ -31,12 +31,12 @@ }, "attachment": [], "tag": [], - "inConversation": "https://testv3.gnusocial.rocks/conversation/1338", + "inConversation": "https://instance.gnusocial.test/conversation/1338", "to": [ "https://www.w3.org/ns/activitystreams#Public" ], "cc": [ - "https://testv3.gnusocial.rocks/actor/42/subscribers", - "https://testv3.gnusocial.rocks/actor/21" + "https://instance.gnusocial.test/actor/42/subscribers", + "https://instance.gnusocial.test/actor/21" ] } \ No newline at end of file diff --git a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/person.jsonld b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/person.jsonld similarity index 63% rename from plugins/ActivityPub/tests/fixtures/gnusocial/objects/person.jsonld rename to plugins/ActivityPub/Test/Fixtures/gnusocial/objects/person.jsonld index 0c7c4dcb18..8ad2461790 100755 --- a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/person.jsonld +++ b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/person.jsonld @@ -20,23 +20,23 @@ } } ], - "id": "https://testv3.gnusocial.rocks/actor/42", - "inbox": "https://testv3.gnusocial.rocks/actor/42/inbox.json", - "outbox": "https://testv3.gnusocial.rocks/actor/42/outbox.json", - "following": "https://testv3.gnusocial.rocks/actor/42/subscriptions", - "followers": "https://testv3.gnusocial.rocks/actor/42/subscribers", - "liked": "https://testv3.gnusocial.rocks/actor/42/favourites", + "id": "https://instance.gnusocial.test/actor/42", + "inbox": "https://instance.gnusocial.test/actor/42/inbox.json", + "outbox": "https://instance.gnusocial.test/actor/42/outbox.json", + "following": "https://instance.gnusocial.test/actor/42/subscriptions", + "followers": "https://instance.gnusocial.test/actor/42/subscribers", + "liked": "https://instance.gnusocial.test/actor/42/favourites", "preferredUsername": "diogo", "publicKey": { - "id": "https://testv3.gnusocial.rocks/actor/42#public-key", - "owner": "https://testv3.gnusocial.rocks/actor/42", + "id": "https://instance.gnusocial.test/actor/42#public-key", + "owner": "https://instance.gnusocial.test/actor/42", "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArBB+3ldwA2qC1hQTtIho\n9KYhvvMlPdydn8dA6OlyIQ3Jy57ADt2e144jDSY5RQ3esmzWm2QqsI8rAsZsAraO\nl2+855y7Fw35WH4GBc7PJ6MLAEvMk1YWeS/rttXaDzh2i4n/AXkMuxDjS1IBqw2w\nn0qTz2sdGcBJ+mop6AB9Qt2lseBc5IW040jSnfLEDDIaYgoc5m2yRsjGKItOh3BG\njGHDb6JB9FySToSMGIt0/tE5k06wfvAxtkxX5dfGeKtciBpC2MGT169iyMIOM8DN\nFhSl8mowtV1NJQ7nN692USrmNvSJjqe9ugPCDPPvwQ5A6A61Qrgpz5pav/o5Sz69\nzQIDAQAB\n-----END PUBLIC KEY-----\n" }, "name": "Diogo Peralta Cordeiro", "published": "2022-02-23T17:20:30+00:00", "updated": "2022-02-25T02:12:48+00:00", - "url": "https://testv3.gnusocial.rocks/@diogo", + "url": "https://instance.gnusocial.test/@diogo", "endpoints": { - "sharedInbox": "https://testv3.gnusocial.rocks/inbox.json" + "sharedInbox": "https://instance.gnusocial.test/inbox.json" } } \ No newline at end of file diff --git a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/reply.jsonld b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/reply.jsonld similarity index 68% rename from plugins/ActivityPub/tests/fixtures/gnusocial/objects/reply.jsonld rename to plugins/ActivityPub/Test/Fixtures/gnusocial/objects/reply.jsonld index 3429286daf..de1b2af575 100755 --- a/plugins/ActivityPub/tests/fixtures/gnusocial/objects/reply.jsonld +++ b/plugins/ActivityPub/Test/Fixtures/gnusocial/objects/reply.jsonld @@ -19,9 +19,9 @@ } } ], - "id": "https://testv3.gnusocial.rocks/object/note/1339", + "id": "https://instance.gnusocial.test/object/note/1339", "published": "2022-03-01T21:00:16+00:00", - "attributedTo": "https://testv3.gnusocial.rocks/actor/42", + "attributedTo": "https://instance.gnusocial.test/actor/42", "content": "

yay ^^

", "mediaType": "text/html", "source": { @@ -30,12 +30,12 @@ }, "attachment": [], "tag": [], - "inReplyTo": "https://testv3.gnusocial.rocks/object/note/1338", - "inConversation": "https://testv3.gnusocial.rocks/conversation/1338", + "inReplyTo": "https://instance.gnusocial.test/object/note/1338", + "inConversation": "https://instance.gnusocial.test/conversation/1338", "to": [ "https://www.w3.org/ns/activitystreams#Public" ], "cc": [ - "https://testv3.gnusocial.rocks/actor/42/subscribers" + "https://instance.gnusocial.test/actor/42/subscribers" ] } \ No newline at end of file diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/block/block_user.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/block/block_user.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/block/block_user.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/block/block_user.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/block/undo_block_user.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/block/undo_block_user.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/block/undo_block_user.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/block/undo_block_user.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/community/add_mod.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/add_mod.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/community/add_mod.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/add_mod.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/community/announce_create_page.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/announce_create_page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/community/announce_create_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/announce_create_page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/community/remove_mod.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/remove_mod.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/community/remove_mod.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/remove_mod.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/community/report_page.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/report_page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/community/report_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/report_page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/community/update_community.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/update_community.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/community/update_community.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/community/update_community.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/create_or_update/create_note.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/create_or_update/create_note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/create_or_update/create_note.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/create_or_update/create_note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/create_or_update/create_page.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/create_or_update/create_page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/create_or_update/create_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/create_or_update/create_page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/create_or_update/create_private_message.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/create_or_update/create_private_message.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/create_or_update/create_private_message.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/create_or_update/create_private_message.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/create_or_update/update_page.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/create_or_update/update_page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/create_or_update/update_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/create_or_update/update_page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/delete_page.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/delete_page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/delete_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/delete_page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/delete_private_message.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/delete_private_message.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/delete_private_message.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/delete_private_message.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/remove_note.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/remove_note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/remove_note.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/remove_note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/undo_delete_page.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/undo_delete_page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/undo_delete_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/undo_delete_page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/undo_delete_private_message.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/undo_delete_private_message.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/undo_delete_private_message.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/undo_delete_private_message.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/undo_remove_note.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/undo_remove_note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/deletion/undo_remove_note.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/deletion/undo_remove_note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/following/accept.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/following/accept.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/following/accept.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/following/accept.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/following/follow.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/following/follow.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/following/follow.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/following/follow.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/following/undo_follow.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/following/undo_follow.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/following/undo_follow.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/following/undo_follow.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/voting/dislike_page.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/voting/dislike_page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/voting/dislike_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/voting/dislike_page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/voting/like_note.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/voting/like_note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/voting/like_note.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/voting/like_note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/voting/undo_dislike_page.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/voting/undo_dislike_page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/voting/undo_dislike_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/voting/undo_dislike_page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/activities/voting/undo_like_note.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/activities/voting/undo_like_note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/activities/voting/undo_like_note.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/activities/voting/undo_like_note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/collections/group_followers.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/collections/group_followers.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/collections/group_followers.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/collections/group_followers.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/collections/group_moderators.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/collections/group_moderators.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/collections/group_moderators.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/collections/group_moderators.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/collections/group_outbox.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/collections/group_outbox.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/collections/group_outbox.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/collections/group_outbox.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/collections/person_outbox.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/collections/person_outbox.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/collections/person_outbox.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/collections/person_outbox.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/context.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/context.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/context.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/context.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/objects/chat_message.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/objects/chat_message.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/objects/chat_message.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/objects/chat_message.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/objects/group.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/objects/group.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/objects/group.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/objects/group.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/objects/instance.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/objects/instance.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/objects/instance.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/objects/instance.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/objects/note.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/objects/note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/objects/note.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/objects/note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/objects/page.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/objects/page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/objects/page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/objects/page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/objects/person.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/objects/person.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/objects/person.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/objects/person.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lemmy/objects/tombstone.jsonld b/plugins/ActivityPub/Test/Fixtures/lemmy/objects/tombstone.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lemmy/objects/tombstone.jsonld rename to plugins/ActivityPub/Test/Fixtures/lemmy/objects/tombstone.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lotide/activities/create_note_reply.jsonld b/plugins/ActivityPub/Test/Fixtures/lotide/activities/create_note_reply.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lotide/activities/create_note_reply.jsonld rename to plugins/ActivityPub/Test/Fixtures/lotide/activities/create_note_reply.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lotide/activities/create_page.jsonld b/plugins/ActivityPub/Test/Fixtures/lotide/activities/create_page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lotide/activities/create_page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lotide/activities/create_page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lotide/activities/delete_note.jsonld b/plugins/ActivityPub/Test/Fixtures/lotide/activities/delete_note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lotide/activities/delete_note.jsonld rename to plugins/ActivityPub/Test/Fixtures/lotide/activities/delete_note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lotide/objects/group.jsonld b/plugins/ActivityPub/Test/Fixtures/lotide/objects/group.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lotide/objects/group.jsonld rename to plugins/ActivityPub/Test/Fixtures/lotide/objects/group.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lotide/objects/note.jsonld b/plugins/ActivityPub/Test/Fixtures/lotide/objects/note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lotide/objects/note.jsonld rename to plugins/ActivityPub/Test/Fixtures/lotide/objects/note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lotide/objects/page.jsonld b/plugins/ActivityPub/Test/Fixtures/lotide/objects/page.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lotide/objects/page.jsonld rename to plugins/ActivityPub/Test/Fixtures/lotide/objects/page.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lotide/objects/person.jsonld b/plugins/ActivityPub/Test/Fixtures/lotide/objects/person.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lotide/objects/person.jsonld rename to plugins/ActivityPub/Test/Fixtures/lotide/objects/person.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/lotide/objects/tombstone.jsonld b/plugins/ActivityPub/Test/Fixtures/lotide/objects/tombstone.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/lotide/objects/tombstone.jsonld rename to plugins/ActivityPub/Test/Fixtures/lotide/objects/tombstone.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/mastodon/activities/create_note.jsonld b/plugins/ActivityPub/Test/Fixtures/mastodon/activities/create_note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/mastodon/activities/create_note.jsonld rename to plugins/ActivityPub/Test/Fixtures/mastodon/activities/create_note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/mastodon/activities/delete.jsonld b/plugins/ActivityPub/Test/Fixtures/mastodon/activities/delete.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/mastodon/activities/delete.jsonld rename to plugins/ActivityPub/Test/Fixtures/mastodon/activities/delete.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/mastodon/activities/follow.jsonld b/plugins/ActivityPub/Test/Fixtures/mastodon/activities/follow.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/mastodon/activities/follow.jsonld rename to plugins/ActivityPub/Test/Fixtures/mastodon/activities/follow.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/mastodon/activities/undo_follow.jsonld b/plugins/ActivityPub/Test/Fixtures/mastodon/activities/undo_follow.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/mastodon/activities/undo_follow.jsonld rename to plugins/ActivityPub/Test/Fixtures/mastodon/activities/undo_follow.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/mastodon/objects/note.jsonld b/plugins/ActivityPub/Test/Fixtures/mastodon/objects/note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/mastodon/objects/note.jsonld rename to plugins/ActivityPub/Test/Fixtures/mastodon/objects/note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/mastodon/objects/person.jsonld b/plugins/ActivityPub/Test/Fixtures/mastodon/objects/person.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/mastodon/objects/person.jsonld rename to plugins/ActivityPub/Test/Fixtures/mastodon/objects/person.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/pleroma/activities/create_note.jsonld b/plugins/ActivityPub/Test/Fixtures/pleroma/activities/create_note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/pleroma/activities/create_note.jsonld rename to plugins/ActivityPub/Test/Fixtures/pleroma/activities/create_note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/pleroma/activities/delete.jsonld b/plugins/ActivityPub/Test/Fixtures/pleroma/activities/delete.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/pleroma/activities/delete.jsonld rename to plugins/ActivityPub/Test/Fixtures/pleroma/activities/delete.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/pleroma/activities/follow.jsonld b/plugins/ActivityPub/Test/Fixtures/pleroma/activities/follow.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/pleroma/activities/follow.jsonld rename to plugins/ActivityPub/Test/Fixtures/pleroma/activities/follow.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/pleroma/objects/chat_message.jsonld b/plugins/ActivityPub/Test/Fixtures/pleroma/objects/chat_message.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/pleroma/objects/chat_message.jsonld rename to plugins/ActivityPub/Test/Fixtures/pleroma/objects/chat_message.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/pleroma/objects/note.jsonld b/plugins/ActivityPub/Test/Fixtures/pleroma/objects/note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/pleroma/objects/note.jsonld rename to plugins/ActivityPub/Test/Fixtures/pleroma/objects/note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/pleroma/objects/person.jsonld b/plugins/ActivityPub/Test/Fixtures/pleroma/objects/person.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/pleroma/objects/person.jsonld rename to plugins/ActivityPub/Test/Fixtures/pleroma/objects/person.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/smithereen/activities/create_note.jsonld b/plugins/ActivityPub/Test/Fixtures/smithereen/activities/create_note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/smithereen/activities/create_note.jsonld rename to plugins/ActivityPub/Test/Fixtures/smithereen/activities/create_note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/smithereen/objects/note.jsonld b/plugins/ActivityPub/Test/Fixtures/smithereen/objects/note.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/smithereen/objects/note.jsonld rename to plugins/ActivityPub/Test/Fixtures/smithereen/objects/note.jsonld diff --git a/plugins/ActivityPub/tests/fixtures/smithereen/objects/person.jsonld b/plugins/ActivityPub/Test/Fixtures/smithereen/objects/person.jsonld similarity index 100% rename from plugins/ActivityPub/tests/fixtures/smithereen/objects/person.jsonld rename to plugins/ActivityPub/Test/Fixtures/smithereen/objects/person.jsonld diff --git a/plugins/ActivityPub/tests/Objects/GSGroupTest.php b/plugins/ActivityPub/Test/Objects/GSActorGroupTest.php similarity index 78% rename from plugins/ActivityPub/tests/Objects/GSGroupTest.php rename to plugins/ActivityPub/Test/Objects/GSActorGroupTest.php index 796ec8a187..e9fe142aa2 100644 --- a/plugins/ActivityPub/tests/Objects/GSGroupTest.php +++ b/plugins/ActivityPub/Test/Objects/GSActorGroupTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace Plugin\ActivityPub\tests\Objects; +namespace Plugin\ActivityPub\Test\Objects; use App\Entity\Actor; use App\Util\GNUsocialTestCase; @@ -29,16 +29,18 @@ use Plugin\ActivityPub\Entity\ActivitypubActor; use Plugin\ActivityPub\Entity\ActivitypubRsa; use Plugin\ActivityPub\Util\Explorer; -class GSGroupTest extends GNUsocialTestCase +class GSActorGroupTest extends GNUsocialTestCase { public function testGroupFromJson() { - $group = Explorer::getOneFromUri('https://testv3.gnusocial.rocks/actor/21', try_online: false); + self::bootKernel(); + + $group = Explorer::getOneFromUri('https://instance.gnusocial.test/actor/21', try_online: false); $ap_group = ActivitypubActor::getByPK(['actor_id' => $group->getId()]); - static::assertSame('https://testv3.gnusocial.rocks/actor/21/inbox.json', $ap_group->getInboxUri()); - static::assertSame('https://testv3.gnusocial.rocks/inbox.json', $ap_group->getInboxSharedUri()); + static::assertSame('https://instance.gnusocial.test/actor/21/inbox.json', $ap_group->getInboxUri()); + static::assertSame('https://instance.gnusocial.test/inbox.json', $ap_group->getInboxSharedUri()); $group = $ap_group->getActor(); - static::assertSame('https://testv3.gnusocial.rocks/actor/21', $group->getUri()); + static::assertSame('https://instance.gnusocial.test/actor/21', $group->getUri()); static::assertSame(Actor::GROUP, $group->getType()); static::assertSame('hackers', $group->getNickname()); static::assertSame('Hackers!', $group->getFullname()); diff --git a/plugins/ActivityPub/tests/Objects/GSPersonTest.php b/plugins/ActivityPub/Test/Objects/GSActorPersonTest.php similarity index 78% rename from plugins/ActivityPub/tests/Objects/GSPersonTest.php rename to plugins/ActivityPub/Test/Objects/GSActorPersonTest.php index 1f496e7f03..93933fb20f 100644 --- a/plugins/ActivityPub/tests/Objects/GSPersonTest.php +++ b/plugins/ActivityPub/Test/Objects/GSActorPersonTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace Plugin\ActivityPub\tests\Objects; +namespace Plugin\ActivityPub\Test\Objects; use App\Entity\Actor; use App\Util\GNUsocialTestCase; @@ -29,16 +29,18 @@ use Plugin\ActivityPub\Entity\ActivitypubActor; use Plugin\ActivityPub\Entity\ActivitypubRsa; use Plugin\ActivityPub\Util\Explorer; -class GSPersonTest extends GNUsocialTestCase +class GSActorPersonTest extends GNUsocialTestCase { public function testPersonFromJson() { - $person = Explorer::getOneFromUri('https://testv3.gnusocial.rocks/actor/42', try_online: false); + self::bootKernel(); + + $person = Explorer::getOneFromUri('https://instance.gnusocial.test/actor/42', try_online: false); $ap_person = ActivitypubActor::getByPK(['actor_id' => $person->getId()]); - static::assertSame('https://testv3.gnusocial.rocks/actor/42/inbox.json', $ap_person->getInboxUri()); - static::assertSame('https://testv3.gnusocial.rocks/inbox.json', $ap_person->getInboxSharedUri()); + static::assertSame('https://instance.gnusocial.test/actor/42/inbox.json', $ap_person->getInboxUri()); + static::assertSame('https://instance.gnusocial.test/inbox.json', $ap_person->getInboxSharedUri()); $person = $ap_person->getActor(); - static::assertSame('https://testv3.gnusocial.rocks/actor/42', $person->getUri()); + static::assertSame('https://instance.gnusocial.test/actor/42', $person->getUri()); static::assertSame(Actor::PERSON, $person->getType()); static::assertSame('diogo', $person->getNickname()); static::assertSame('Diogo Peralta Cordeiro', $person->getFullname()); diff --git a/plugins/ActivityPub/Util/Model/Note.php b/plugins/ActivityPub/Util/Model/Note.php index dad78b13da..b510cdd8e7 100644 --- a/plugins/ActivityPub/Util/Model/Note.php +++ b/plugins/ActivityPub/Util/Model/Note.php @@ -188,7 +188,7 @@ class Note extends Model $attention_targets = []; foreach ($to as $target) { - if ($target === 'https://www.w3.org/ns/activitystreams#Public') { + if (\in_array($target, ActivityPub::PUBLIC_TO)) { continue; } try { @@ -217,7 +217,7 @@ class Note extends Model } foreach ($cc as $target) { - if ($target === 'https://www.w3.org/ns/activitystreams#Public') { + if (\in_array($target, ActivityPub::PUBLIC_TO)) { continue; } try { diff --git a/plugins/ActivityPub/tests/fixtures/ActivityPubFixtures.php b/plugins/ActivityPub/tests/fixtures/ActivityPubFixtures.php deleted file mode 100644 index 8b4d715bd0..0000000000 --- a/plugins/ActivityPub/tests/fixtures/ActivityPubFixtures.php +++ /dev/null @@ -1,53 +0,0 @@ -getContainer()->get('test.service_container'); - $services = F\map( + static::$container = self::$kernel->getContainer()->get('test.service_container'); + $services = F\map( (new ReflectionClass(GNUsocial::class))->getMethod('__construct')->getParameters(), - fn ($p) => $container->get((string) $p->getType()), + fn ($p) => static::$container->get((string) $p->getType()), ); self::$social = new GNUsocial(...$services); } diff --git a/tests/Controller/AdminTest.php b/tests/Controller/AdminTest.php index d26507a2a1..5f8a6570bb 100644 --- a/tests/Controller/AdminTest.php +++ b/tests/Controller/AdminTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace App\Tests\Controller; +namespace App\Test\Controller; use App\Core\DB\DB; use App\Entity\LocalUser; diff --git a/tests/Controller/SecurityTest.php b/tests/Controller/SecurityTest.php index 295c3ce9e0..3d064f0291 100644 --- a/tests/Controller/SecurityTest.php +++ b/tests/Controller/SecurityTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace App\Tests\Controller; +namespace App\Test\Controller; use App\Util\GNUsocialTestCase; diff --git a/tests/Core/CacheTest.php b/tests/Core/CacheTest.php index ca3f3bc0be..92037efbdc 100644 --- a/tests/Core/CacheTest.php +++ b/tests/Core/CacheTest.php @@ -21,15 +21,15 @@ declare(strict_types = 1); // }}} -namespace App\Tests\Core; +namespace App\Test\Core; use App\Core\Cache; use App\Util\Common; +use App\Util\GNUsocialTestCase; use ReflectionClass; -use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface; -class CacheTest extends KernelTestCase +class CacheTest extends GNUsocialTestCase { private function doTest(array $adapters, $result_pool, $throws = null, $recompute = \INF) { @@ -38,7 +38,7 @@ class CacheTest extends KernelTestCase // Setup Common::config to have the values in $conf $conf = ['cache' => ['adapters' => $adapters, 'early_recompute' => $recompute]]; $cb = $this->createMock(ContainerBagInterface::class); - static::assertTrue($cb instanceof ContainerBagInterface); + static::assertInstanceOf(ContainerBagInterface::class, $cb); $cb->method('get') ->willReturnMap([['gnusocial', $conf], ['gnusocial_defaults', $conf]]); Common::setupConfig($cb); diff --git a/tests/Core/ControllerTest.php b/tests/Core/ControllerTest.php index 5de8213d89..54f8aa8c04 100644 --- a/tests/Core/ControllerTest.php +++ b/tests/Core/ControllerTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace App\Tests\Core; +namespace App\Test\Core; use App\Util\GNUsocialTestCase; use Jchook\AssertThrows\AssertThrows; diff --git a/tests/Core/DB/DBTest.php b/tests/Core/DB/DBTest.php index 9191b70864..7b50455927 100644 --- a/tests/Core/DB/DBTest.php +++ b/tests/Core/DB/DBTest.php @@ -19,7 +19,7 @@ declare(strict_types = 1); // along with GNU social. If not, see . // }}} -namespace App\Tests\Core\DB; +namespace App\Test\Core\DB; use App\Core\ActorLocalRoles; use App\Core\DB\DB; @@ -66,7 +66,7 @@ class DBTest extends GNUsocialTestCase { static::bootKernel(); $actor = DB::findOneBy('actor', ['nickname' => 'taken_user']); - static::assertTrue($actor instanceof Actor); + static::assertInstanceOf(Actor::class, $actor); static::assertThrows(DuplicateFoundException::class, fn () => DB::findOneBy('actor', ['is_null' => 'bio'])); static::assertThrows(NotFoundException::class, fn () => DB::findOneBy('actor', ['nickname' => 'nickname_not_in_use'])); @@ -86,6 +86,6 @@ class DBTest extends GNUsocialTestCase $id = DB::persistWithSameId($actor, $user, fn ($id) => $id); static::assertTrue($id != 0); static::assertTrue($actor->getId() == $id); - static::assertTrue($user->getId() == $id); + static::assertTrue($user->getId() == $id); } } diff --git a/tests/Core/DB/UpdateListenerTest.php b/tests/Core/DB/UpdateListenerTest.php index f3f42f8b94..0aadd2b0c9 100644 --- a/tests/Core/DB/UpdateListenerTest.php +++ b/tests/Core/DB/UpdateListenerTest.php @@ -19,7 +19,7 @@ declare(strict_types = 1); // along with GNU social. If not, see . // }}} -namespace App\Tests\Core\DB; +namespace App\Test\Core\DB; use App\Core\DB\DB; use App\Core\DB\UpdateListener; diff --git a/tests/Core/EntityTest.php b/tests/Core/EntityTest.php index 5ddbbf0364..bbdefa7bcd 100644 --- a/tests/Core/EntityTest.php +++ b/tests/Core/EntityTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace App\Tests\Core; +namespace App\Test\Core; use App\Core\DB\DB; use App\Entity\LocalUser; diff --git a/tests/Core/EventTest.php b/tests/Core/EventTest.php index 7f745b2e58..6d7dac5908 100644 --- a/tests/Core/EventTest.php +++ b/tests/Core/EventTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace App\Tests\Core; +namespace App\Test\Core; use App\Core\Event; use App\Util\GNUsocialTestCase; diff --git a/tests/Core/FormTest.php b/tests/Core/FormTest.php index b920a0bfe7..bc4cc2e99e 100644 --- a/tests/Core/FormTest.php +++ b/tests/Core/FormTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace App\Tests\Core; +namespace App\Test\Core; use App\Core\ActorLocalRoles; use App\Core\DB\DB; diff --git a/tests/Core/GSFileTest.php b/tests/Core/GSFileTest.php index 20a2f0aff1..0ef19623d7 100644 --- a/tests/Core/GSFileTest.php +++ b/tests/Core/GSFileTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace App\Tests\Core; +namespace App\Test\Core; use App\Core\GSFile; use App\Util\GNUsocialTestCase; diff --git a/tests/Core/I18n/I18nTest.php b/tests/Core/I18n/I18nTest.php index adac2b9f8a..17ddcd2ecc 100644 --- a/tests/Core/I18n/I18nTest.php +++ b/tests/Core/I18n/I18nTest.php @@ -19,15 +19,15 @@ declare(strict_types = 1); // along with GNU social. If not, see . // }}} -namespace App\Tests\Core\I18n; +namespace App\Test\Core\I18n; use function App\Core\I18n\_m; use App\Core\I18n\I18n; +use App\Util\GNUsocialTestCase; use InvalidArgumentException; use Jchook\AssertThrows\AssertThrows; -use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; -class I18nTest extends KernelTestCase +class I18nTest extends GNUsocialTestCase { use AssertThrows; diff --git a/tests/Core/RouterTest.php b/tests/Core/RouterTest.php index 56c29cada2..ea3029ff74 100644 --- a/tests/Core/RouterTest.php +++ b/tests/Core/RouterTest.php @@ -21,7 +21,7 @@ declare(strict_types = 1); // }}} -namespace App\Tests\Core; +namespace App\Test\Core; use App\Core\Router\RouteLoader; use App\Core\Router\Router; diff --git a/tests/fixtures/CoreFixtures.php b/tests/fixtures/CoreFixtures.php index 56ba0f4893..06c803be44 100644 --- a/tests/fixtures/CoreFixtures.php +++ b/tests/fixtures/CoreFixtures.php @@ -109,10 +109,10 @@ class CoreFixtures extends Fixture $manager->persist(Notification::create(['activity_id' => $activity->getId(), 'target_id' => $local_entities['taken_private_group']->getActorId(), 'reason' => 'testing'])); } - $manager->persist(Attention::create(['note_id' => $public_group_note->getId(), 'target_id' => $local_entities['taken_public_group']->getActorId()])); + $manager->persist(Attention::create(['object_type' => Note::schemaName(), 'object_id' => $public_group_note->getId(), 'target_id' => $local_entities['taken_public_group']->getActorId()])); $manager->persist(GroupMember::create(['group_id' => $local_entities['taken_private_group']->getActorId(), 'actor_id' => $actors['some_user']->getId()])); - $manager->persist(Attention::create(['note_id' => $private_group_note->getId(), 'target_id' => $local_entities['taken_private_group']->getActorId()])); + $manager->persist(Attention::create(['object_type' => Note::schemaName(), 'object_id' => $private_group_note->getId(), 'target_id' => $local_entities['taken_private_group']->getActorId()])); $manager->flush(); }