From e6617af0f9d16d3df87f9482e0d32adec091e52a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 13 May 2022 16:58:38 -0500 Subject: [PATCH] Refactor context test, remove dumb fixtures --- app/soapbox/__fixtures__/context_1.json | 739 ------------------ app/soapbox/__fixtures__/context_2.json | 739 ------------------ .../reducers/__tests__/contexts-test.js | 97 +-- 3 files changed, 43 insertions(+), 1532 deletions(-) delete mode 100644 app/soapbox/__fixtures__/context_1.json delete mode 100644 app/soapbox/__fixtures__/context_2.json diff --git a/app/soapbox/__fixtures__/context_1.json b/app/soapbox/__fixtures__/context_1.json deleted file mode 100644 index 2e37a5502..000000000 --- a/app/soapbox/__fixtures__/context_1.json +++ /dev/null @@ -1,739 +0,0 @@ -{ - "ancestors": [ - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

A

", - "created_at": "2020-09-18T20:07:10.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH6kDXA10YqhMKqO", - "in_reply_to_account_id": null, - "in_reply_to_id": null, - "language": null, - "media_attachments": [], - "mentions": [], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "A" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": null, - "local": true, - "parent_visible": false, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/9995c074-2ff6-4a01-b596-7ef6971ed5d2", - "url": "https://gleasonator.com/notice/9zIH6kDXA10YqhMKqO", - "visibility": "direct" - }, - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

B

", - "created_at": "2020-09-18T20:07:18.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH7PUdhK3Ircg4hM", - "in_reply_to_account_id": "9v5bmRalQvjOy0ECcC", - "in_reply_to_id": "9zIH6kDXA10YqhMKqO", - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "B" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": "alex", - "local": true, - "parent_visible": true, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/992ca99a-425d-46eb-b094-60412e9fb141", - "url": "https://gleasonator.com/notice/9zIH7PUdhK3Ircg4hM", - "visibility": "direct" - }, - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

C

", - "created_at": "2020-09-18T20:07:22.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH7mMGgc1RmJwDLM", - "in_reply_to_account_id": "9v5bmRalQvjOy0ECcC", - "in_reply_to_id": "9zIH6kDXA10YqhMKqO", - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "C" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": "alex", - "local": true, - "parent_visible": true, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/a2c25ef5-a40e-4098-b07e-b468989ef749", - "url": "https://gleasonator.com/notice/9zIH7mMGgc1RmJwDLM", - "visibility": "direct" - } - ], - "descendants": [ - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

E

", - "created_at": "2020-09-18T20:07:38.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH9GTCDWEFSRt2um", - "in_reply_to_account_id": "9v5bmRalQvjOy0ECcC", - "in_reply_to_id": "9zIH7PUdhK3Ircg4hM", - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "E" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": "alex", - "local": true, - "parent_visible": true, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/a1e45493-2158-4f11-88ca-ba621429dbe5", - "url": "https://gleasonator.com/notice/9zIH9GTCDWEFSRt2um", - "visibility": "direct" - }, - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

F

", - "created_at": "2020-09-18T20:07:42.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH9fhaP9atiJoOJc", - "in_reply_to_account_id": "9v5bmRalQvjOy0ECcC", - "in_reply_to_id": "9zIH8WYwtnUx4yDzUm", - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "F" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": "alex", - "local": true, - "parent_visible": true, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/ee661cf9-35d4-4e84-88ff-13b5950f7556", - "url": "https://gleasonator.com/notice/9zIH9fhaP9atiJoOJc", - "visibility": "direct" - } - ] -} diff --git a/app/soapbox/__fixtures__/context_2.json b/app/soapbox/__fixtures__/context_2.json deleted file mode 100644 index c5cf2a813..000000000 --- a/app/soapbox/__fixtures__/context_2.json +++ /dev/null @@ -1,739 +0,0 @@ -{ - "ancestors": [ - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

A

", - "created_at": "2020-09-18T20:07:10.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH6kDXA10YqhMKqO", - "in_reply_to_account_id": null, - "in_reply_to_id": null, - "language": null, - "media_attachments": [], - "mentions": [], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "A" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": null, - "local": true, - "parent_visible": false, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/9995c074-2ff6-4a01-b596-7ef6971ed5d2", - "url": "https://gleasonator.com/notice/9zIH6kDXA10YqhMKqO", - "visibility": "direct" - } - ], - "descendants": [ - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

C

", - "created_at": "2020-09-18T20:07:22.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH7mMGgc1RmJwDLM", - "in_reply_to_account_id": "9v5bmRalQvjOy0ECcC", - "in_reply_to_id": "9zIH6kDXA10YqhMKqO", - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "C" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": "alex", - "local": true, - "parent_visible": true, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/a2c25ef5-a40e-4098-b07e-b468989ef749", - "url": "https://gleasonator.com/notice/9zIH7mMGgc1RmJwDLM", - "visibility": "direct" - }, - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

D

", - "created_at": "2020-09-18T20:07:30.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH8WYwtnUx4yDzUm", - "in_reply_to_account_id": "9v5bmRalQvjOy0ECcC", - "in_reply_to_id": "9zIH7PUdhK3Ircg4hM", - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "D" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": "alex", - "local": true, - "parent_visible": true, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/bb423adc-ed86-42d8-942e-84efbe7b1acf", - "url": "https://gleasonator.com/notice/9zIH8WYwtnUx4yDzUm", - "visibility": "direct" - }, - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

E

", - "created_at": "2020-09-18T20:07:38.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH9GTCDWEFSRt2um", - "in_reply_to_account_id": "9v5bmRalQvjOy0ECcC", - "in_reply_to_id": "9zIH7PUdhK3Ircg4hM", - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "E" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": "alex", - "local": true, - "parent_visible": true, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/a1e45493-2158-4f11-88ca-ba621429dbe5", - "url": "https://gleasonator.com/notice/9zIH9GTCDWEFSRt2um", - "visibility": "direct" - }, - { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "avatar_static": "https://media.gleasonator.com/26f0ca4ef51f7047829fdb65a43cb7d0304413ce0a5d00dd1638458994608718.jpg", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "follow_requests_count": 0, - "followers_count": 725, - "following_count": 1211, - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "locked": false, - "note": "Fediverse developer. I come in peace.

#vegan #freeculture #atheist #antiporn #gendercritical.

Boosts ≠ endorsements.", - "pleroma": { - "accepts_chat_messages": true, - "allow_following_move": true, - "ap_id": "https://gleasonator.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "deactivated": false, - "favicon": "https://gleasonator.com/favicon.png", - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": true, - "is_moderator": false, - "notification_settings": { - "block_from_strangers": false, - "hide_notification_contents": false - }, - "relationship": {}, - "skip_thread_containment": false, - "tags": [], - "unread_conversation_count": 95, - "unread_notifications_count": 0 - }, - "source": { - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - } - ], - "note": "Fediverse developer. I come in peace.\r\n\r\n#vegan #freeculture #atheist #antiporn #gendercritical.\r\n\r\nBoosts ≠ endorsements.", - "pleroma": { - "actor_type": "Person", - "discoverable": false, - "no_rich_text": false, - "show_role": true - }, - "privacy": "public", - "sensitive": false - }, - "statuses_count": 9157, - "url": "https://gleasonator.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "

F

", - "created_at": "2020-09-18T20:07:42.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "9zIH9fhaP9atiJoOJc", - "in_reply_to_account_id": "9v5bmRalQvjOy0ECcC", - "in_reply_to_id": "9zIH8WYwtnUx4yDzUm", - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "F" - }, - "conversation_id": 5089485, - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": "alex", - "local": true, - "parent_visible": true, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/ee661cf9-35d4-4e84-88ff-13b5950f7556", - "url": "https://gleasonator.com/notice/9zIH9fhaP9atiJoOJc", - "visibility": "direct" - } - ] -} diff --git a/app/soapbox/reducers/__tests__/contexts-test.js b/app/soapbox/reducers/__tests__/contexts-test.js index 9708120bb..47d421f3b 100644 --- a/app/soapbox/reducers/__tests__/contexts-test.js +++ b/app/soapbox/reducers/__tests__/contexts-test.js @@ -4,9 +4,7 @@ import { fromJS, } from 'immutable'; -import context1 from 'soapbox/__fixtures__/context_1.json'; -import context2 from 'soapbox/__fixtures__/context_2.json'; -import { STATUSES_IMPORT } from 'soapbox/actions/importer'; +import { STATUS_IMPORT } from 'soapbox/actions/importer'; import { CONTEXT_FETCH_SUCCESS } from 'soapbox/actions/statuses'; import { TIMELINE_DELETE } from 'soapbox/actions/timelines'; import { applyActions } from 'soapbox/jest/test-helpers'; @@ -21,59 +19,50 @@ describe('contexts reducer', () => { })); }); - it('should support rendering a complete tree', () => { - // https://gitlab.com/soapbox-pub/soapbox-fe/-/issues/422 - const actions = [{ - type: STATUSES_IMPORT, - statuses: [ - ...context1.ancestors, - ...context1.descendants, - ...context2.ancestors, - ...context2.descendants, - ], - }, { - type: CONTEXT_FETCH_SUCCESS, - id: '9zIH8WYwtnUx4yDzUm', - ancestors: context1.ancestors, - descendants: context1.descendants, - }, { - type: CONTEXT_FETCH_SUCCESS, - id: '9zIH7PUdhK3Ircg4hM', - ancestors: context2.ancestors, - descendants: context2.descendants, - }]; + describe(CONTEXT_FETCH_SUCCESS, () => { + it('inserts a tombstone connecting an orphaned descendant', () => { + const status = { id: 'A', in_reply_to_id: null }; - const result = applyActions(undefined, actions, reducer); + const context = { + id: 'A', + ancestors: [], + descendants: [ + { id: 'C', in_reply_to_id: 'B' }, + ], + }; - expect(result).toEqual(ReducerRecord({ - inReplyTos: ImmutableMap({ - '9zIH7PUdhK3Ircg4hM': '9zIH6kDXA10YqhMKqO', - '9zIH7mMGgc1RmJwDLM': '9zIH6kDXA10YqhMKqO', - '9zIH9GTCDWEFSRt2um': '9zIH7PUdhK3Ircg4hM', - '9zIH9fhaP9atiJoOJc': '9zIH8WYwtnUx4yDzUm', - '9zIH8WYwtnUx4yDzUm': '9zIH7PUdhK3Ircg4hM', - '9zIH8WYwtnUx4yDzUm-tombstone': '9zIH7mMGgc1RmJwDLM', - }), - replies: ImmutableMap({ - '9zIH6kDXA10YqhMKqO': ImmutableOrderedSet([ - '9zIH7PUdhK3Ircg4hM', - '9zIH7mMGgc1RmJwDLM', - ]), - '9zIH7PUdhK3Ircg4hM': ImmutableOrderedSet([ - '9zIH8WYwtnUx4yDzUm', - '9zIH9GTCDWEFSRt2um', - ]), - '9zIH8WYwtnUx4yDzUm': ImmutableOrderedSet([ - '9zIH9fhaP9atiJoOJc', - ]), - '9zIH8WYwtnUx4yDzUm-tombstone': ImmutableOrderedSet([ - '9zIH8WYwtnUx4yDzUm', - ]), - '9zIH7mMGgc1RmJwDLM': ImmutableOrderedSet([ - '9zIH8WYwtnUx4yDzUm-tombstone', - ]), - }), - })); + const actions = [ + { type: STATUS_IMPORT, status }, + { type: CONTEXT_FETCH_SUCCESS, ...context }, + ]; + + const result = applyActions(undefined, actions, reducer); + expect(result.inReplyTos.get('C')).toBe('C-tombstone'); + expect(result.replies.get('A').toArray()).toEqual(['C-tombstone']); + }); + }); + + describe(CONTEXT_FETCH_SUCCESS, () => { + it('inserts a tombstone connecting an orphaned descendant (with null in_reply_to_id)', () => { + const status = { id: 'A', in_reply_to_id: null }; + + const context = { + id: 'A', + ancestors: [], + descendants: [ + { id: 'C', in_reply_to_id: null }, + ], + }; + + const actions = [ + { type: STATUS_IMPORT, status }, + { type: CONTEXT_FETCH_SUCCESS, ...context }, + ]; + + const result = applyActions(undefined, actions, reducer); + expect(result.inReplyTos.get('C')).toBe('C-tombstone'); + expect(result.replies.get('A').toArray()).toEqual(['C-tombstone']); + }); }); describe(TIMELINE_DELETE, () => {