From 843f545ceb2f363aea1c6ff79993f004c9999039 Mon Sep 17 00:00:00 2001 From: trevor-signal <131492920+trevor-signal@users.noreply.github.com> Date: Thu, 26 Jun 2025 12:24:07 -0400 Subject: [PATCH] Reorganize test cases --- package.json | 4 ++-- .../AddUserToAnotherGroupModal.stories.tsx | 2 +- ts/components/Avatar.stories.tsx | 2 +- ts/components/AvatarLightbox.stories.tsx | 2 +- ts/components/BadgeDialog.stories.tsx | 2 +- ts/components/CallLinkAddNameModal.stories.tsx | 2 +- ts/components/CallLinkDetails.stories.tsx | 4 ++-- ts/components/CallLinkEditModal.stories.tsx | 2 +- ...CallLinkPendingParticipantModal.stories.tsx | 2 +- ts/components/CallManager.stories.tsx | 6 +++--- .../CallNeedPermissionScreen.stories.tsx | 2 +- ts/components/CallScreen.stories.tsx | 4 ++-- ts/components/CallingAdhocCallInfo.stories.tsx | 2 +- ts/components/CallingLobby.stories.tsx | 4 ++-- .../CallingParticipantsList.stories.tsx | 2 +- ts/components/CallingPip.stories.tsx | 6 +++--- ts/components/CallingPreCallInfo.stories.tsx | 4 ++-- .../CallingRaisedHandsList.stories.tsx | 2 +- ts/components/CollidingAvatars.stories.tsx | 2 +- ts/components/CompositionArea.stories.tsx | 4 ++-- ts/components/CompositionInput.stories.tsx | 2 +- ts/components/ContactPills.stories.tsx | 2 +- ts/components/ConversationList.stories.tsx | 4 ++-- ts/components/DialogExpiredBuild.stories.tsx | 2 +- ts/components/DialogNetworkStatus.stories.tsx | 2 +- ts/components/DialogRelink.stories.tsx | 2 +- ts/components/DialogUpdate.stories.tsx | 2 +- .../DisappearingTimeDialog.stories.tsx | 2 +- .../DraftGifMessageSendModal.stories.tsx | 2 +- .../EditNicknameAndNoteModal.stories.tsx | 2 +- ts/components/ForwardMessagesModal.stories.tsx | 2 +- .../GroupCallOverflowArea.stories.tsx | 4 ++-- .../GroupCallRemoteParticipant.stories.tsx | 2 +- .../GroupV1MigrationDialog.stories.tsx | 2 +- ts/components/IncomingCallBar.stories.tsx | 2 +- ts/components/LeftPane.stories.tsx | 4 ++-- ts/components/Lightbox.stories.tsx | 2 +- ts/components/MediaEditor.stories.tsx | 2 +- ts/components/MyStories.stories.tsx | 4 ++-- ts/components/MyStoryButton.stories.tsx | 4 ++-- ts/components/NavTabs.stories.tsx | 2 +- ...eatedGroupInvitedContactsDialog.stories.tsx | 2 +- ts/components/NotePreviewModal.stories.tsx | 2 +- ts/components/Preferences.stories.tsx | 2 +- ts/components/ProfileEditor.stories.tsx | 2 +- .../SafetyNumberChangeDialog.stories.tsx | 4 ++-- ts/components/SafetyNumberViewer.stories.tsx | 2 +- ts/components/SendStoryModal.stories.tsx | 4 ++-- ts/components/StoriesSettingsModal.stories.tsx | 4 ++-- ts/components/StoriesTab.stories.tsx | 7 ++----- ts/components/StoryCreator.stories.tsx | 6 +++--- ts/components/StoryDetailsModal.stories.tsx | 2 +- ts/components/StoryImage.stories.tsx | 5 +---- ts/components/StoryLinkPreview.stories.tsx | 2 +- ts/components/StoryListItem.stories.tsx | 7 ++----- ts/components/StoryViewer.stories.tsx | 6 +++--- .../StoryViewsNRepliesModal.stories.tsx | 2 +- ts/components/UnsupportedOSDialog.stories.tsx | 2 +- .../conversation/AboutContactModal.stories.tsx | 2 +- .../AttachmentDetailPill.stories.tsx | 2 +- .../conversation/AttachmentList.stories.tsx | 2 +- .../AttachmentStatusIcon.stories.tsx | 2 +- .../CallingNotification.stories.tsx | 2 +- .../ChangeNumberNotification.stories.tsx | 2 +- .../conversation/ContactDetail.stories.tsx | 2 +- .../conversation/ContactModal.stories.tsx | 4 ++-- .../ContactSpoofingReviewDialog.stories.tsx | 2 +- ...ntactSpoofingReviewDialogPerson.stories.tsx | 2 +- .../ConversationHeader.stories.tsx | 4 ++-- .../conversation/ConversationHero.stories.tsx | 2 +- .../DeliveryIssueDialog.stories.tsx | 2 +- .../DeliveryIssueNotification.stories.tsx | 2 +- .../conversation/GroupNotification.stories.tsx | 2 +- .../conversation/GroupV1Migration.stories.tsx | 2 +- ts/components/conversation/Image.stories.tsx | 2 +- .../conversation/ImageGrid.stories.tsx | 2 +- .../MandatoryProfileSharingActions.stories.tsx | 2 +- .../conversation/MessageDetail.stories.tsx | 4 ++-- .../MessageRequestActions.stories.tsx | 2 +- .../ProfileChangeNotification.stories.tsx | 2 +- ts/components/conversation/Quote.stories.tsx | 2 +- .../conversation/ReactionViewer.stories.tsx | 2 +- .../conversation/StagedLinkPreview.stories.tsx | 2 +- .../conversation/Timeline.stories.tsx | 2 +- .../conversation/TimelineItem.stories.tsx | 2 +- .../conversation/TimelineMessage.stories.tsx | 6 +++--- .../conversation/TypingBubble.stories.tsx | 4 ++-- .../UniversalTimerNotification.stories.tsx | 2 +- .../AddGroupMembersModal.stories.tsx | 4 ++-- .../ConversationDetails.stories.tsx | 6 +++--- .../ConversationDetailsHeader.stories.tsx | 4 ++-- .../ConversationDetailsMediaList.stories.tsx | 2 +- ...nversationDetailsMembershipList.stories.tsx | 2 +- .../GroupLinkManagement.stories.tsx | 2 +- .../GroupV2Permissions.stories.tsx | 2 +- .../PendingInvites.stories.tsx | 4 ++-- .../MessageSearchResult.stories.tsx | 4 ++-- .../quill/memberRepository_test.ts | 2 +- .../quill/mentions/completion_test.tsx | 2 +- .../quill/mentions/matchers_test.ts | 2 +- .../sql/getCallHistoryGroups_test.ts | 2 +- ts/test-electron/state/ducks/calling_test.ts | 4 ++-- .../state/ducks/conversations_test.ts | 6 +++--- .../state/selectors/calling_test.ts | 2 +- .../selectors/conversations-extra_test.ts | 2 +- .../state/selectors/messages_test.ts | 2 +- .../util/downloadAttachment_test.ts | 2 +- .../FakeLeftPaneContainer.tsx | 2 +- .../RemoteConfigStub.ts | 4 ++-- .../createCallParticipant.ts | 6 +++--- .../defaultComposerStates.ts | 6 +++--- .../util => test-helpers}/expireTimers.ts | 4 ++-- .../helpers => test-helpers}/fakeAttachment.ts | 4 ++-- .../helpers => test-helpers}/fakeCallLink.ts | 8 ++++---- .../fakeGetGroupCallVideoFrameSource.ts | 0 .../fakeLookupConversationWithoutServiceId.ts | 10 +++++----- .../helpers => test-helpers}/generateBackup.ts | 18 +++++++++--------- .../getDefaultConversation.ts | 14 +++++++------- .../helpers => test-helpers}/getFakeBadge.ts | 8 ++++---- .../getFakeCallHistoryGroup.ts | 6 +++--- .../getFakeDistributionLists.ts | 10 +++++----- .../helpers => test-helpers}/getFakeStory.tsx | 10 +++++----- .../helpers => test-helpers}/getRandomColor.ts | 4 ++-- .../getStickerPacks.ts | 2 +- ts/test-mock/backups/backups_test.ts | 2 +- ts/test-mock/benchmarks/backup_bench.ts | 2 +- ts/{test-both => test-node}/AsyncQueue_test.ts | 0 .../RemoteConfig_test.ts | 0 .../TaskWithTimeout_test.ts | 0 .../badges/getBadgeImageFileLocalPath_test.ts | 0 .../badges/isBadgeImageFileUrlValid_test.ts | 0 .../badges/isBadgeVisible_test.ts | 0 .../badges/parseBadgesFromServer_test.ts | 0 .../calling/findBestMatchingDevice_test.ts | 0 ts/{test-both => test-node}/challenge_test.ts | 0 .../leftPane/LeftPaneArchiveHelper_test.ts | 2 +- .../LeftPaneChooseGroupMembersHelper_test.ts | 2 +- .../leftPane/LeftPaneComposeHelper_test.ts | 2 +- .../leftPane/LeftPaneInboxHelper_test.tsx | 2 +- .../leftPane/LeftPaneSearchHelper_test.ts | 2 +- .../LeftPaneSetGroupMetadataHelper_test.ts | 2 +- .../getConversationInDirection_test.ts | 2 +- .../media-gallery/groupMediaItemsByDate.ts | 2 +- .../isConversationTooBigToRing_test.ts | 2 +- .../environment_test.ts | 0 .../groups/add_banned_member_test.ts | 2 +- .../groups/limits_test.ts | 2 +- .../groups/message_merge_test.ts | 0 .../jobs/helpers/addReportSpamJob_test.ts | 2 +- .../shouldUseFullSizeLinkPreviewImage_test.ts | 2 +- .../logging/formatCountForLogging_test.ts | 0 .../messages/MessageReadStatus_test.ts | 0 .../messages/MessageSendState_test.ts | 0 .../messages/migrateLegacyReadStatus_test.ts | 0 .../migrateLegacySendAttributes_test.ts | 2 +- .../processDataMessage_test.ts | 0 .../processSyncMessage_test.ts | 0 .../reactions/isValidReactionEmoji_test.ts | 0 .../reactions/preferredReactionEmoji_test.ts | 0 .../reactions/util_test.ts | 0 .../services/ourProfileKey_test.ts | 0 .../sql/cleanDataForIpc_test.ts | 0 .../sql/cleanMessageData_test.ts | 0 ts/test-node/sql/migration_1220_test.ts | 2 +- .../state/ducks/audioPlayer_test.ts | 0 .../state/ducks/badges_test.ts | 2 +- .../state/ducks/composer_test.ts | 2 +- .../state/ducks/globalModals_test.ts | 0 .../state/ducks/linkPreviews_test.ts | 0 .../state/ducks/network_test.ts | 0 .../state/ducks/preferredReactions_test.ts | 0 .../state/selectors/conversations_test.ts | 4 ++-- .../state/selectors/items_test.ts | 0 .../state/selectors/preferredReactions_test.ts | 0 .../state/selectors/search_test.ts | 2 +- .../state/selectors/user_test.ts | 0 ts/test-node/types/Attachment_test.ts | 2 +- .../types/Avatar_test.ts | 0 .../types/BodyRange_test.ts | 0 ts/test-node/types/EmbeddedContact_test.ts | 2 +- .../types/PhoneNumber_test.ts | 0 .../types/SchemaVersion_test.ts | 0 .../types/Stickers_test.ts | 0 .../types/StoryDistributionId_test.ts | 0 .../types/errors_test.ts | 0 .../types/setupI18n_test.ts | 0 .../util/AbortableProcess_test.ts | 0 .../util/BackOff_test.ts | 0 ts/{test-both => test-node}/util/Bytes_test.ts | 0 .../util/appendMacStream_test.ts | 0 .../util/areObjectEntriesEqual_test.ts | 0 .../util/arePinnedConversationsEqual_test.ts | 0 .../util/assert_test.ts | 0 .../assignWithNoUnnecessaryAllocation_test.ts | 0 .../util/asyncIterables_test.ts | 0 .../util/awaitObject_test.ts | 0 .../util/batcher_test.ts | 0 ...ckSendUntilConversationsAreVerified_test.ts | 0 ts/test-node/util/callDisposition_test.ts | 2 +- .../util/callLinks_test.ts | 2 +- .../util/callingGetParticipantName_test.ts | 0 .../util/callingNotification_test.ts | 2 +- .../util/characters_test.ts | 0 .../util/clearTimeoutIfNecessary_test.ts | 0 .../util/countUnreadStats_test.ts | 0 .../util/deconstructLookup_test.ts | 0 .../util/diffArraysAsSets_test.ts | 0 .../util/dropNull_test.ts | 0 ts/{test-both => test-node}/util/emoji_test.ts | 0 ts/{test-both => test-node}/util/enum_test.ts | 0 .../util/expirationTimer_test.ts | 0 .../util/explodePromise_test.ts | 0 .../util/exponentialBackoff_test.ts | 0 .../util/filterAndSortConversations_test.ts | 2 +- .../util/getAvatarData_test.ts | 2 +- .../util/getClassNamesFor_test.ts | 0 .../util/getCustomColorStyle.ts | 0 .../util/getFontNameByTextScript_test.ts | 0 .../util/getGroupMemberships_test.ts | 2 +- .../util/getHSL_test.ts | 0 .../util/getInitials_test.ts | 0 .../util/getMuteOptions_test.ts | 0 .../util/getMutedUntilText_test.ts | 0 .../util/getStreamWithTimeout_test.ts | 0 .../util/graphemeAndLinkAwareSlice.ts | 0 .../util/grapheme_test.ts | 0 .../util/groupMemberNameCollisions_test.ts | 2 +- .../util/isConversationMuted_test.ts | 0 .../util/isConversationNameKnown_test.ts | 0 .../util/isConversationSMSOnly_test.ts | 0 .../util/isConversationUnread_test.ts | 0 .../util/isConversationUnregistered_test.ts | 0 .../util/isInSystemContacts_test.ts | 0 .../util/isMessageUnread_test.ts | 0 .../util/isNormalNumber_test.ts | 0 .../util/isNotNil_test.ts | 0 .../util/isRecord_test.ts | 0 .../util/isSorted_test.ts | 0 .../util/isValidE164_test.ts | 0 .../util/isValidUuid.ts | 0 .../util/iterables_test.ts | 0 .../util/libphonenumberUtil_test.ts | 0 .../util/logPadding_test.ts | 0 .../util/makeLookup_test.ts | 0 .../util/mapUtil_test.ts | 0 .../util/normalizeDeviceName_test.ts | 0 .../util/parseIntOrThrow_test.ts | 0 .../util/parseIntWithFallback_test.ts | 0 .../util/parseRetryAfter_test.ts | 0 .../util/prependStream_test.ts | 0 .../util/privacy_test.ts | 0 .../util/reallyJsonStringify_test.ts | 0 .../util/replaceIndex_test.ts | 0 .../util/retryPlaceholders_test.ts | 0 .../util/searchConversationTitles_test.ts | 2 +- .../util/search_test.ts | 0 .../util/serverAlerts_test.ts | 0 .../util/sessionTranslation_test.ts | 0 .../util/setUtil_test.ts | 0 .../util/startTimeTravelDetector_test.ts | 0 ts/{test-both => test-node}/util/theme_test.ts | 0 .../util/timelineUtil_test.ts | 0 .../util/timestampLongUtils_test.ts | 0 .../util/timestamp_test.ts | 0 .../util/unicodeBidi_test.ts | 0 ts/{test-both => test-node}/util/url_test.ts | 0 .../util/userLanguages_test.ts | 0 .../util/version_test.ts | 0 .../util/waitBatcher_test.ts | 0 ts/{test-both => test-node}/util/waitForAll.ts | 0 .../util/webSafeBase64_test.ts | 0 271 files changed, 236 insertions(+), 245 deletions(-) rename ts/{test-both/helpers => test-helpers}/FakeLeftPaneContainer.tsx (91%) rename ts/{test-both/helpers => test-helpers}/RemoteConfigStub.ts (83%) rename ts/{test-both/helpers => test-helpers}/createCallParticipant.ts (85%) rename ts/{test-both/helpers => test-helpers}/defaultComposerStates.ts (83%) rename ts/{test-both/util => test-helpers}/expireTimers.ts (84%) rename ts/{test-both/helpers => test-helpers}/fakeAttachment.ts (92%) rename ts/{test-both/helpers => test-helpers}/fakeCallLink.ts (85%) rename ts/{test-both/helpers => test-helpers}/fakeGetGroupCallVideoFrameSource.ts (100%) rename ts/{test-both/helpers => test-helpers}/fakeLookupConversationWithoutServiceId.ts (88%) rename ts/{test-both/helpers => test-helpers}/generateBackup.ts (91%) rename ts/{test-both/helpers => test-helpers}/getDefaultConversation.ts (85%) rename ts/{test-both/helpers => test-helpers}/getFakeBadge.ts (82%) rename ts/{test-both/helpers => test-helpers}/getFakeCallHistoryGroup.ts (86%) rename ts/{test-both/helpers => test-helpers}/getFakeDistributionLists.ts (81%) rename ts/{test-both/helpers => test-helpers}/getFakeStory.tsx (87%) rename ts/{test-both/helpers => test-helpers}/getRandomColor.ts (66%) rename ts/{test-both/helpers => test-helpers}/getStickerPacks.ts (96%) rename ts/{test-both => test-node}/AsyncQueue_test.ts (100%) rename ts/{test-both => test-node}/RemoteConfig_test.ts (100%) rename ts/{test-both => test-node}/TaskWithTimeout_test.ts (100%) rename ts/{test-both => test-node}/badges/getBadgeImageFileLocalPath_test.ts (100%) rename ts/{test-both => test-node}/badges/isBadgeImageFileUrlValid_test.ts (100%) rename ts/{test-both => test-node}/badges/isBadgeVisible_test.ts (100%) rename ts/{test-both => test-node}/badges/parseBadgesFromServer_test.ts (100%) rename ts/{test-both => test-node}/calling/findBestMatchingDevice_test.ts (100%) rename ts/{test-both => test-node}/challenge_test.ts (100%) rename ts/{test-both => test-node}/conversations/isConversationTooBigToRing_test.ts (96%) rename ts/{test-both => test-node}/environment_test.ts (100%) rename ts/{test-both => test-node}/groups/add_banned_member_test.ts (97%) rename ts/{test-both => test-node}/groups/limits_test.ts (96%) rename ts/{test-both => test-node}/groups/message_merge_test.ts (100%) rename ts/{test-both => test-node}/linkPreviews/shouldUseFullSizeLinkPreviewImage_test.ts (98%) rename ts/{test-both => test-node}/logging/formatCountForLogging_test.ts (100%) rename ts/{test-both => test-node}/messages/MessageReadStatus_test.ts (100%) rename ts/{test-both => test-node}/messages/MessageSendState_test.ts (100%) rename ts/{test-both => test-node}/messages/migrateLegacyReadStatus_test.ts (100%) rename ts/{test-both => test-node}/messages/migrateLegacySendAttributes_test.ts (98%) rename ts/{test-both => test-node}/processDataMessage_test.ts (100%) rename ts/{test-both => test-node}/processSyncMessage_test.ts (100%) rename ts/{test-both => test-node}/reactions/isValidReactionEmoji_test.ts (100%) rename ts/{test-both => test-node}/reactions/preferredReactionEmoji_test.ts (100%) rename ts/{test-both => test-node}/reactions/util_test.ts (100%) rename ts/{test-both => test-node}/services/ourProfileKey_test.ts (100%) rename ts/{test-both => test-node}/sql/cleanDataForIpc_test.ts (100%) rename ts/{test-both => test-node}/sql/cleanMessageData_test.ts (100%) rename ts/{test-both => test-node}/state/ducks/audioPlayer_test.ts (100%) rename ts/{test-both => test-node}/state/ducks/badges_test.ts (98%) rename ts/{test-both => test-node}/state/ducks/composer_test.ts (98%) rename ts/{test-both => test-node}/state/ducks/globalModals_test.ts (100%) rename ts/{test-both => test-node}/state/ducks/linkPreviews_test.ts (100%) rename ts/{test-both => test-node}/state/ducks/network_test.ts (100%) rename ts/{test-both => test-node}/state/ducks/preferredReactions_test.ts (100%) rename ts/{test-both => test-node}/state/selectors/conversations_test.ts (99%) rename ts/{test-both => test-node}/state/selectors/items_test.ts (100%) rename ts/{test-both => test-node}/state/selectors/preferredReactions_test.ts (100%) rename ts/{test-both => test-node}/state/selectors/search_test.ts (99%) rename ts/{test-both => test-node}/state/selectors/user_test.ts (100%) rename ts/{test-both => test-node}/types/Avatar_test.ts (100%) rename ts/{test-both => test-node}/types/BodyRange_test.ts (100%) rename ts/{test-both => test-node}/types/PhoneNumber_test.ts (100%) rename ts/{test-both => test-node}/types/SchemaVersion_test.ts (100%) rename ts/{test-both => test-node}/types/Stickers_test.ts (100%) rename ts/{test-both => test-node}/types/StoryDistributionId_test.ts (100%) rename ts/{test-both => test-node}/types/errors_test.ts (100%) rename ts/{test-both => test-node}/types/setupI18n_test.ts (100%) rename ts/{test-both => test-node}/util/AbortableProcess_test.ts (100%) rename ts/{test-both => test-node}/util/BackOff_test.ts (100%) rename ts/{test-both => test-node}/util/Bytes_test.ts (100%) rename ts/{test-both => test-node}/util/appendMacStream_test.ts (100%) rename ts/{test-both => test-node}/util/areObjectEntriesEqual_test.ts (100%) rename ts/{test-both => test-node}/util/arePinnedConversationsEqual_test.ts (100%) rename ts/{test-both => test-node}/util/assert_test.ts (100%) rename ts/{test-both => test-node}/util/assignWithNoUnnecessaryAllocation_test.ts (100%) rename ts/{test-both => test-node}/util/asyncIterables_test.ts (100%) rename ts/{test-both => test-node}/util/awaitObject_test.ts (100%) rename ts/{test-both => test-node}/util/batcher_test.ts (100%) rename ts/{test-both => test-node}/util/blockSendUntilConversationsAreVerified_test.ts (100%) rename ts/{test-both => test-node}/util/callLinks_test.ts (94%) rename ts/{test-both => test-node}/util/callingGetParticipantName_test.ts (100%) rename ts/{test-both => test-node}/util/callingNotification_test.ts (99%) rename ts/{test-both => test-node}/util/characters_test.ts (100%) rename ts/{test-both => test-node}/util/clearTimeoutIfNecessary_test.ts (100%) rename ts/{test-both => test-node}/util/countUnreadStats_test.ts (100%) rename ts/{test-both => test-node}/util/deconstructLookup_test.ts (100%) rename ts/{test-both => test-node}/util/diffArraysAsSets_test.ts (100%) rename ts/{test-both => test-node}/util/dropNull_test.ts (100%) rename ts/{test-both => test-node}/util/emoji_test.ts (100%) rename ts/{test-both => test-node}/util/enum_test.ts (100%) rename ts/{test-both => test-node}/util/expirationTimer_test.ts (100%) rename ts/{test-both => test-node}/util/explodePromise_test.ts (100%) rename ts/{test-both => test-node}/util/exponentialBackoff_test.ts (100%) rename ts/{test-both => test-node}/util/filterAndSortConversations_test.ts (97%) rename ts/{test-both => test-node}/util/getAvatarData_test.ts (93%) rename ts/{test-both => test-node}/util/getClassNamesFor_test.ts (100%) rename ts/{test-both => test-node}/util/getCustomColorStyle.ts (100%) rename ts/{test-both => test-node}/util/getFontNameByTextScript_test.ts (100%) rename ts/{test-both => test-node}/util/getGroupMemberships_test.ts (98%) rename ts/{test-both => test-node}/util/getHSL_test.ts (100%) rename ts/{test-both => test-node}/util/getInitials_test.ts (100%) rename ts/{test-both => test-node}/util/getMuteOptions_test.ts (100%) rename ts/{test-both => test-node}/util/getMutedUntilText_test.ts (100%) rename ts/{test-both => test-node}/util/getStreamWithTimeout_test.ts (100%) rename ts/{test-both => test-node}/util/graphemeAndLinkAwareSlice.ts (100%) rename ts/{test-both => test-node}/util/grapheme_test.ts (100%) rename ts/{test-both => test-node}/util/groupMemberNameCollisions_test.ts (98%) rename ts/{test-both => test-node}/util/isConversationMuted_test.ts (100%) rename ts/{test-both => test-node}/util/isConversationNameKnown_test.ts (100%) rename ts/{test-both => test-node}/util/isConversationSMSOnly_test.ts (100%) rename ts/{test-both => test-node}/util/isConversationUnread_test.ts (100%) rename ts/{test-both => test-node}/util/isConversationUnregistered_test.ts (100%) rename ts/{test-both => test-node}/util/isInSystemContacts_test.ts (100%) rename ts/{test-both => test-node}/util/isMessageUnread_test.ts (100%) rename ts/{test-both => test-node}/util/isNormalNumber_test.ts (100%) rename ts/{test-both => test-node}/util/isNotNil_test.ts (100%) rename ts/{test-both => test-node}/util/isRecord_test.ts (100%) rename ts/{test-both => test-node}/util/isSorted_test.ts (100%) rename ts/{test-both => test-node}/util/isValidE164_test.ts (100%) rename ts/{test-both => test-node}/util/isValidUuid.ts (100%) rename ts/{test-both => test-node}/util/iterables_test.ts (100%) rename ts/{test-both => test-node}/util/libphonenumberUtil_test.ts (100%) rename ts/{test-both => test-node}/util/logPadding_test.ts (100%) rename ts/{test-both => test-node}/util/makeLookup_test.ts (100%) rename ts/{test-both => test-node}/util/mapUtil_test.ts (100%) rename ts/{test-both => test-node}/util/normalizeDeviceName_test.ts (100%) rename ts/{test-both => test-node}/util/parseIntOrThrow_test.ts (100%) rename ts/{test-both => test-node}/util/parseIntWithFallback_test.ts (100%) rename ts/{test-both => test-node}/util/parseRetryAfter_test.ts (100%) rename ts/{test-both => test-node}/util/prependStream_test.ts (100%) rename ts/{test-both => test-node}/util/privacy_test.ts (100%) rename ts/{test-both => test-node}/util/reallyJsonStringify_test.ts (100%) rename ts/{test-both => test-node}/util/replaceIndex_test.ts (100%) rename ts/{test-both => test-node}/util/retryPlaceholders_test.ts (100%) rename ts/{test-both => test-node}/util/searchConversationTitles_test.ts (94%) rename ts/{test-both => test-node}/util/search_test.ts (100%) rename ts/{test-both => test-node}/util/serverAlerts_test.ts (100%) rename ts/{test-both => test-node}/util/sessionTranslation_test.ts (100%) rename ts/{test-both => test-node}/util/setUtil_test.ts (100%) rename ts/{test-both => test-node}/util/startTimeTravelDetector_test.ts (100%) rename ts/{test-both => test-node}/util/theme_test.ts (100%) rename ts/{test-both => test-node}/util/timelineUtil_test.ts (100%) rename ts/{test-both => test-node}/util/timestampLongUtils_test.ts (100%) rename ts/{test-both => test-node}/util/timestamp_test.ts (100%) rename ts/{test-both => test-node}/util/unicodeBidi_test.ts (100%) rename ts/{test-both => test-node}/util/url_test.ts (100%) rename ts/{test-both => test-node}/util/userLanguages_test.ts (100%) rename ts/{test-both => test-node}/util/version_test.ts (100%) rename ts/{test-both => test-node}/util/waitBatcher_test.ts (100%) rename ts/{test-both => test-node}/util/waitForAll.ts (100%) rename ts/{test-both => test-node}/util/webSafeBase64_test.ts (100%) diff --git a/package.json b/package.json index 1ff9dd556a..d3df626d35 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "test": "run-s test-node test-electron test-lint-intl test-eslint", "test-electron": "node ts/scripts/test-electron.js", "test-release": "node ts/scripts/test-release.js", - "test-node": "cross-env LANG=en-us electron-mocha --timeout 10000 --main test/fix-linux-gtk.js --file test/setup-test-node.js --recursive ts/test-node ts/test-both", + "test-node": "cross-env LANG=en-us electron-mocha --timeout 10000 --main test/fix-linux-gtk.js --file test/setup-test-node.js --recursive ts/test-node", "test-mock": "mocha --require ts/test-mock/setup-ci.js ts/test-mock/**/*_test.js", "test-eslint": "mocha .eslint/rules/**/*.test.js --ignore-leaks", "test-lint-intl": "ts-node ./build/intl-linter/linter.ts --test", @@ -567,7 +567,7 @@ "ts/*.js", "!ts/scripts/**", "!build", - "!ts/{storybook,test-node,test-mock,test-both,test-electron}", + "!ts/{storybook,test-helpers,test-node,test-mock,test-electron}", "!**/{tsconfig,bower,component}.json", "!**/.{github,husky,grenrc,npmrc,nycrc,taprc,bithoundrc}", "!**/.testem.json", diff --git a/ts/components/AddUserToAnotherGroupModal.stories.tsx b/ts/components/AddUserToAnotherGroupModal.stories.tsx index e1312da0c3..0b2af18ab4 100644 --- a/ts/components/AddUserToAnotherGroupModal.stories.tsx +++ b/ts/components/AddUserToAnotherGroupModal.stories.tsx @@ -9,7 +9,7 @@ import type { Props } from './AddUserToAnotherGroupModal'; import { getDefaultConversation, getDefaultGroup, -} from '../test-both/helpers/getDefaultConversation'; +} from '../test-helpers/getDefaultConversation'; import { AddUserToAnotherGroupModal } from './AddUserToAnotherGroupModal'; const { i18n } = window.SignalContext; diff --git a/ts/components/Avatar.stories.tsx b/ts/components/Avatar.stories.tsx index 57ada62e4e..5fd1b12c6c 100644 --- a/ts/components/Avatar.stories.tsx +++ b/ts/components/Avatar.stories.tsx @@ -11,7 +11,7 @@ import { Avatar, AvatarBlur, AvatarSize } from './Avatar'; import { AvatarColors } from '../types/Colors'; import { HasStories } from '../types/Stories'; import { ThemeType } from '../types/Util'; -import { getFakeBadge } from '../test-both/helpers/getFakeBadge'; +import { getFakeBadge } from '../test-helpers/getFakeBadge'; const { i18n } = window.SignalContext; diff --git a/ts/components/AvatarLightbox.stories.tsx b/ts/components/AvatarLightbox.stories.tsx index 837c77ebc8..e209d94609 100644 --- a/ts/components/AvatarLightbox.stories.tsx +++ b/ts/components/AvatarLightbox.stories.tsx @@ -7,7 +7,7 @@ import type { Meta } from '@storybook/react'; import { AvatarColors } from '../types/Colors'; import type { PropsType } from './AvatarLightbox'; import { AvatarLightbox } from './AvatarLightbox'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/BadgeDialog.stories.tsx b/ts/components/BadgeDialog.stories.tsx index 2313bbdb09..3e6f4faecf 100644 --- a/ts/components/BadgeDialog.stories.tsx +++ b/ts/components/BadgeDialog.stories.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; -import { getFakeBadge, getFakeBadges } from '../test-both/helpers/getFakeBadge'; +import { getFakeBadge, getFakeBadges } from '../test-helpers/getFakeBadge'; import { repeat, zipObject } from '../util/iterables'; import { BadgeImageTheme } from '../badges/BadgeImageTheme'; import type { PropsType } from './BadgeDialog'; diff --git a/ts/components/CallLinkAddNameModal.stories.tsx b/ts/components/CallLinkAddNameModal.stories.tsx index 8ba514359c..b7cc057214 100644 --- a/ts/components/CallLinkAddNameModal.stories.tsx +++ b/ts/components/CallLinkAddNameModal.stories.tsx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; import type { CallLinkAddNameModalProps } from './CallLinkAddNameModal'; import { CallLinkAddNameModal } from './CallLinkAddNameModal'; import type { ComponentMeta } from '../storybook/types'; -import { FAKE_CALL_LINK_WITH_ADMIN_KEY } from '../test-both/helpers/fakeCallLink'; +import { FAKE_CALL_LINK_WITH_ADMIN_KEY } from '../test-helpers/fakeCallLink'; const { i18n } = window.SignalContext; diff --git a/ts/components/CallLinkDetails.stories.tsx b/ts/components/CallLinkDetails.stories.tsx index a6df12bc0d..c9040ac236 100644 --- a/ts/components/CallLinkDetails.stories.tsx +++ b/ts/components/CallLinkDetails.stories.tsx @@ -8,8 +8,8 @@ import { CallLinkDetails } from './CallLinkDetails'; import { FAKE_CALL_LINK, FAKE_CALL_LINK_WITH_ADMIN_KEY, -} from '../test-both/helpers/fakeCallLink'; -import { getFakeCallLinkHistoryGroup } from '../test-both/helpers/getFakeCallHistoryGroup'; +} from '../test-helpers/fakeCallLink'; +import { getFakeCallLinkHistoryGroup } from '../test-helpers/getFakeCallHistoryGroup'; const { i18n } = window.SignalContext; diff --git a/ts/components/CallLinkEditModal.stories.tsx b/ts/components/CallLinkEditModal.stories.tsx index 51b5b70c4c..423df4f276 100644 --- a/ts/components/CallLinkEditModal.stories.tsx +++ b/ts/components/CallLinkEditModal.stories.tsx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; import type { CallLinkEditModalProps } from './CallLinkEditModal'; import { CallLinkEditModal } from './CallLinkEditModal'; import type { ComponentMeta } from '../storybook/types'; -import { FAKE_CALL_LINK_WITH_ADMIN_KEY } from '../test-both/helpers/fakeCallLink'; +import { FAKE_CALL_LINK_WITH_ADMIN_KEY } from '../test-helpers/fakeCallLink'; const { i18n } = window.SignalContext; diff --git a/ts/components/CallLinkPendingParticipantModal.stories.tsx b/ts/components/CallLinkPendingParticipantModal.stories.tsx index 765afc7962..2216266043 100644 --- a/ts/components/CallLinkPendingParticipantModal.stories.tsx +++ b/ts/components/CallLinkPendingParticipantModal.stories.tsx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; import type { CallLinkPendingParticipantModalProps } from './CallLinkPendingParticipantModal'; import { CallLinkPendingParticipantModal } from './CallLinkPendingParticipantModal'; import type { ComponentMeta } from '../storybook/types'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/CallManager.stories.tsx b/ts/components/CallManager.stories.tsx index 94c167dfde..d3b95dfeb0 100644 --- a/ts/components/CallManager.stories.tsx +++ b/ts/components/CallManager.stories.tsx @@ -24,14 +24,14 @@ import type { } from '../state/ducks/conversations'; import { AvatarColors } from '../types/Colors'; import { generateAci } from '../types/ServiceId'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; -import { fakeGetGroupCallVideoFrameSource } from '../test-both/helpers/fakeGetGroupCallVideoFrameSource'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; +import { fakeGetGroupCallVideoFrameSource } from '../test-helpers/fakeGetGroupCallVideoFrameSource'; import { StorySendMode } from '../types/Stories'; import { FAKE_CALL_LINK, FAKE_CALL_LINK_WITH_ADMIN_KEY, getDefaultCallLinkConversation, -} from '../test-both/helpers/fakeCallLink'; +} from '../test-helpers/fakeCallLink'; import { allRemoteParticipants } from './CallScreen.stories'; import { getPlaceholderContact } from '../state/selectors/conversations'; diff --git a/ts/components/CallNeedPermissionScreen.stories.tsx b/ts/components/CallNeedPermissionScreen.stories.tsx index 97ce310625..e0dd03e621 100644 --- a/ts/components/CallNeedPermissionScreen.stories.tsx +++ b/ts/components/CallNeedPermissionScreen.stories.tsx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; import type { ComponentMeta } from '../storybook/types'; import type { Props } from './CallNeedPermissionScreen'; import { CallNeedPermissionScreen } from './CallNeedPermissionScreen'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/CallScreen.stories.tsx b/ts/components/CallScreen.stories.tsx index b99119c630..5cc86c6c80 100644 --- a/ts/components/CallScreen.stories.tsx +++ b/ts/components/CallScreen.stories.tsx @@ -30,8 +30,8 @@ import { missingCaseError } from '../util/missingCaseError'; import { getDefaultConversation, getDefaultConversationWithServiceId, -} from '../test-both/helpers/getDefaultConversation'; -import { fakeGetGroupCallVideoFrameSource } from '../test-both/helpers/fakeGetGroupCallVideoFrameSource'; +} from '../test-helpers/getDefaultConversation'; +import { fakeGetGroupCallVideoFrameSource } from '../test-helpers/fakeGetGroupCallVideoFrameSource'; import { CallingToastProvider, useCallingToasts } from './CallingToast'; import type { CallingImageDataCache } from './CallManager'; import { MINUTE } from '../util/durations'; diff --git a/ts/components/CallingAdhocCallInfo.stories.tsx b/ts/components/CallingAdhocCallInfo.stories.tsx index 7ed364482b..178149666f 100644 --- a/ts/components/CallingAdhocCallInfo.stories.tsx +++ b/ts/components/CallingAdhocCallInfo.stories.tsx @@ -11,7 +11,7 @@ import { CallingAdhocCallInfo } from './CallingAdhocCallInfo'; import { AvatarColors } from '../types/Colors'; import type { GroupCallRemoteParticipantType } from '../types/Calling'; import { generateAci } from '../types/ServiceId'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import type { CallLinkType } from '../types/CallLink'; import { CallLinkRestrictions } from '../types/CallLink'; diff --git a/ts/components/CallingLobby.stories.tsx b/ts/components/CallingLobby.stories.tsx index 66a8dc8642..605a1c718b 100644 --- a/ts/components/CallingLobby.stories.tsx +++ b/ts/components/CallingLobby.stories.tsx @@ -15,10 +15,10 @@ import { generateAci } from '../types/ServiceId'; import { getDefaultConversation, getDefaultConversationWithServiceId, -} from '../test-both/helpers/getDefaultConversation'; +} from '../test-helpers/getDefaultConversation'; import { CallingToastProvider } from './CallingToast'; import { CallMode } from '../types/CallDisposition'; -import { getDefaultCallLinkConversation } from '../test-both/helpers/fakeCallLink'; +import { getDefaultCallLinkConversation } from '../test-helpers/fakeCallLink'; const { i18n } = window.SignalContext; diff --git a/ts/components/CallingParticipantsList.stories.tsx b/ts/components/CallingParticipantsList.stories.tsx index c2356c0cac..741fd9172e 100644 --- a/ts/components/CallingParticipantsList.stories.tsx +++ b/ts/components/CallingParticipantsList.stories.tsx @@ -9,7 +9,7 @@ import type { Meta } from '@storybook/react'; import type { PropsType } from './CallingParticipantsList'; import { CallingParticipantsList } from './CallingParticipantsList'; import { generateAci } from '../types/ServiceId'; -import { createCallParticipant } from '../test-both/helpers/createCallParticipant'; +import { createCallParticipant } from '../test-helpers/createCallParticipant'; const { i18n } = window.SignalContext; diff --git a/ts/components/CallingPip.stories.tsx b/ts/components/CallingPip.stories.tsx index 0439e8f8b8..31ab480b9c 100644 --- a/ts/components/CallingPip.stories.tsx +++ b/ts/components/CallingPip.stories.tsx @@ -17,11 +17,11 @@ import { GroupCallJoinState, } from '../types/Calling'; import { CallMode } from '../types/CallDisposition'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; -import { fakeGetGroupCallVideoFrameSource } from '../test-both/helpers/fakeGetGroupCallVideoFrameSource'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; +import { fakeGetGroupCallVideoFrameSource } from '../test-helpers/fakeGetGroupCallVideoFrameSource'; import { MINUTE } from '../util/durations'; import type { SetRendererCanvasType } from '../state/ducks/calling'; -import { createCallParticipant } from '../test-both/helpers/createCallParticipant'; +import { createCallParticipant } from '../test-helpers/createCallParticipant'; const { i18n } = window.SignalContext; diff --git a/ts/components/CallingPreCallInfo.stories.tsx b/ts/components/CallingPreCallInfo.stories.tsx index 3f8cb3e96e..b0ea785b7b 100644 --- a/ts/components/CallingPreCallInfo.stories.tsx +++ b/ts/components/CallingPreCallInfo.stories.tsx @@ -4,13 +4,13 @@ import React from 'react'; import { times } from 'lodash'; import type { Meta } from '@storybook/react'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import type { PropsType } from './CallingPreCallInfo'; import { CallingPreCallInfo, RingMode } from './CallingPreCallInfo'; import type { ConversationType } from '../state/ducks/conversations'; import { getPlaceholderContact } from '../state/selectors/conversations'; import { generateAci } from '../types/ServiceId'; -import { FAKE_CALL_LINK } from '../test-both/helpers/fakeCallLink'; +import { FAKE_CALL_LINK } from '../test-helpers/fakeCallLink'; import { callLinkToConversation } from '../util/callLinks'; const { i18n } = window.SignalContext; diff --git a/ts/components/CallingRaisedHandsList.stories.tsx b/ts/components/CallingRaisedHandsList.stories.tsx index f34f344898..e475c5011c 100644 --- a/ts/components/CallingRaisedHandsList.stories.tsx +++ b/ts/components/CallingRaisedHandsList.stories.tsx @@ -16,7 +16,7 @@ import { } from './CallingRaisedHandsList'; import type { ConversationType } from '../state/ducks/conversations'; import { AvatarColors } from '../types/Colors'; -import { getDefaultConversationWithServiceId } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversationWithServiceId } from '../test-helpers/getDefaultConversation'; const MAX_HANDS = 20; const LOCAL_DEMUX_ID = 1; diff --git a/ts/components/CollidingAvatars.stories.tsx b/ts/components/CollidingAvatars.stories.tsx index b78b42cc47..171512a0c5 100644 --- a/ts/components/CollidingAvatars.stories.tsx +++ b/ts/components/CollidingAvatars.stories.tsx @@ -5,7 +5,7 @@ import React from 'react'; import type { PropsType } from './CollidingAvatars'; import { CollidingAvatars } from './CollidingAvatars'; import { type ComponentMeta } from '../storybook/types'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/CompositionArea.stories.tsx b/ts/components/CompositionArea.stories.tsx index ca7d2a00e5..1b0b1d7d47 100644 --- a/ts/components/CompositionArea.stories.tsx +++ b/ts/components/CompositionArea.stories.tsx @@ -9,11 +9,11 @@ import type { Props } from './CompositionArea'; import { CompositionArea } from './CompositionArea'; import { StorybookThemeContext } from '../../.storybook/StorybookThemeContext'; -import { fakeDraftAttachment } from '../test-both/helpers/fakeAttachment'; +import { fakeDraftAttachment } from '../test-helpers/fakeAttachment'; import { landscapeGreenUrl } from '../storybook/Fixtures'; import { RecordingState } from '../types/AudioRecorder'; import { ConversationColors } from '../types/Colors'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { PaymentEventKind } from '../types/Payment'; import { EmojiSkinTone } from './fun/data/emojis'; diff --git a/ts/components/CompositionInput.stories.tsx b/ts/components/CompositionInput.stories.tsx index 047df7bcab..394201ca46 100644 --- a/ts/components/CompositionInput.stories.tsx +++ b/ts/components/CompositionInput.stories.tsx @@ -6,7 +6,7 @@ import * as React from 'react'; import '@signalapp/quill-cjs/dist/quill.core.css'; import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import type { Props } from './CompositionInput'; import { CompositionInput } from './CompositionInput'; import { generateAci } from '../types/ServiceId'; diff --git a/ts/components/ContactPills.stories.tsx b/ts/components/ContactPills.stories.tsx index abff739a8e..7613eea614 100644 --- a/ts/components/ContactPills.stories.tsx +++ b/ts/components/ContactPills.stories.tsx @@ -11,7 +11,7 @@ import { ContactPills } from './ContactPills'; import type { PropsType as ContactPillPropsType } from './ContactPill'; import { ContactPill } from './ContactPill'; import { gifUrl } from '../storybook/Fixtures'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/ConversationList.stories.tsx b/ts/components/ConversationList.stories.tsx index e77ef9df91..60873432f8 100644 --- a/ts/components/ConversationList.stories.tsx +++ b/ts/components/ConversationList.stories.tsx @@ -12,10 +12,10 @@ import { MessageSearchResult } from './conversationList/MessageSearchResult'; import type { PropsData as ConversationListItemPropsType } from './conversationList/ConversationListItem'; import { MessageStatuses } from './conversationList/ConversationListItem'; import { ContactCheckboxDisabledReason } from './conversationList/ContactCheckbox'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { ThemeType } from '../types/Util'; import { StorybookThemeContext } from '../../.storybook/StorybookThemeContext'; -import { makeFakeLookupConversationWithoutServiceId } from '../test-both/helpers/fakeLookupConversationWithoutServiceId'; +import { makeFakeLookupConversationWithoutServiceId } from '../test-helpers/fakeLookupConversationWithoutServiceId'; const { i18n } = window.SignalContext; diff --git a/ts/components/DialogExpiredBuild.stories.tsx b/ts/components/DialogExpiredBuild.stories.tsx index 936c6639b0..e17a9eb73c 100644 --- a/ts/components/DialogExpiredBuild.stories.tsx +++ b/ts/components/DialogExpiredBuild.stories.tsx @@ -6,7 +6,7 @@ import type { Meta } from '@storybook/react'; import type { PropsType } from './DialogExpiredBuild'; import { DialogExpiredBuild } from './DialogExpiredBuild'; import { WidthBreakpoint } from './_util'; -import { FakeLeftPaneContainer } from '../test-both/helpers/FakeLeftPaneContainer'; +import { FakeLeftPaneContainer } from '../test-helpers/FakeLeftPaneContainer'; const { i18n } = window.SignalContext; diff --git a/ts/components/DialogNetworkStatus.stories.tsx b/ts/components/DialogNetworkStatus.stories.tsx index 1584c47b45..e62579d9db 100644 --- a/ts/components/DialogNetworkStatus.stories.tsx +++ b/ts/components/DialogNetworkStatus.stories.tsx @@ -9,7 +9,7 @@ import type { PropsType } from './DialogNetworkStatus'; import { DialogNetworkStatus } from './DialogNetworkStatus'; import { SocketStatus } from '../types/SocketStatus'; import { WidthBreakpoint } from './_util'; -import { FakeLeftPaneContainer } from '../test-both/helpers/FakeLeftPaneContainer'; +import { FakeLeftPaneContainer } from '../test-helpers/FakeLeftPaneContainer'; const { i18n } = window.SignalContext; diff --git a/ts/components/DialogRelink.stories.tsx b/ts/components/DialogRelink.stories.tsx index 8b117382d9..874f1193a2 100644 --- a/ts/components/DialogRelink.stories.tsx +++ b/ts/components/DialogRelink.stories.tsx @@ -7,7 +7,7 @@ import type { Meta } from '@storybook/react'; import type { PropsType } from './DialogRelink'; import { DialogRelink } from './DialogRelink'; import { WidthBreakpoint } from './_util'; -import { FakeLeftPaneContainer } from '../test-both/helpers/FakeLeftPaneContainer'; +import { FakeLeftPaneContainer } from '../test-helpers/FakeLeftPaneContainer'; const { i18n } = window.SignalContext; diff --git a/ts/components/DialogUpdate.stories.tsx b/ts/components/DialogUpdate.stories.tsx index 6e0c24972b..b3038e383b 100644 --- a/ts/components/DialogUpdate.stories.tsx +++ b/ts/components/DialogUpdate.stories.tsx @@ -9,7 +9,7 @@ import { DialogUpdate } from './DialogUpdate'; import { DialogType } from '../types/Dialogs'; import { WidthBreakpoint } from './_util'; import { SECOND } from '../util/durations'; -import { FakeLeftPaneContainer } from '../test-both/helpers/FakeLeftPaneContainer'; +import { FakeLeftPaneContainer } from '../test-helpers/FakeLeftPaneContainer'; const { i18n } = window.SignalContext; diff --git a/ts/components/DisappearingTimeDialog.stories.tsx b/ts/components/DisappearingTimeDialog.stories.tsx index 1b642fa4c2..b618174add 100644 --- a/ts/components/DisappearingTimeDialog.stories.tsx +++ b/ts/components/DisappearingTimeDialog.stories.tsx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; import type { PropsType } from './DisappearingTimeDialog'; import { DisappearingTimeDialog } from './DisappearingTimeDialog'; -import { EXPIRE_TIMERS } from '../test-both/util/expireTimers'; +import { EXPIRE_TIMERS } from '../test-helpers/expireTimers'; export default { title: 'Components/DisappearingTimeDialog', diff --git a/ts/components/DraftGifMessageSendModal.stories.tsx b/ts/components/DraftGifMessageSendModal.stories.tsx index 33a3231590..3497429a4b 100644 --- a/ts/components/DraftGifMessageSendModal.stories.tsx +++ b/ts/components/DraftGifMessageSendModal.stories.tsx @@ -14,7 +14,7 @@ import { EmojiSkinTone } from './fun/data/emojis'; import { LoadingState } from '../util/loadable'; import { VIDEO_MP4 } from '../types/MIME'; import { drop } from '../util/drop'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/EditNicknameAndNoteModal.stories.tsx b/ts/components/EditNicknameAndNoteModal.stories.tsx index 02af384b67..28b97fb660 100644 --- a/ts/components/EditNicknameAndNoteModal.stories.tsx +++ b/ts/components/EditNicknameAndNoteModal.stories.tsx @@ -3,7 +3,7 @@ import { action } from '@storybook/addon-actions'; import * as React from 'react'; import type { ComponentMeta } from '../storybook/types'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import type { EditNicknameAndNoteModalProps } from './EditNicknameAndNoteModal'; import { EditNicknameAndNoteModal } from './EditNicknameAndNoteModal'; diff --git a/ts/components/ForwardMessagesModal.stories.tsx b/ts/components/ForwardMessagesModal.stories.tsx index c749e3af6d..672c004765 100644 --- a/ts/components/ForwardMessagesModal.stories.tsx +++ b/ts/components/ForwardMessagesModal.stories.tsx @@ -11,7 +11,7 @@ import { ForwardMessagesModalType, } from './ForwardMessagesModal'; import { IMAGE_JPEG, VIDEO_MP4, stringToMIMEType } from '../types/MIME'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { StorybookThemeContext } from '../../.storybook/StorybookThemeContext'; import { CompositionTextArea } from './CompositionTextArea'; import type { MessageForwardDraft } from '../types/ForwardDraft'; diff --git a/ts/components/GroupCallOverflowArea.stories.tsx b/ts/components/GroupCallOverflowArea.stories.tsx index 4945a647aa..ce1480ca4f 100644 --- a/ts/components/GroupCallOverflowArea.stories.tsx +++ b/ts/components/GroupCallOverflowArea.stories.tsx @@ -7,8 +7,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; import type { PropsType } from './GroupCallOverflowArea'; import { GroupCallOverflowArea } from './GroupCallOverflowArea'; -import { getDefaultConversationWithServiceId } from '../test-both/helpers/getDefaultConversation'; -import { fakeGetGroupCallVideoFrameSource } from '../test-both/helpers/fakeGetGroupCallVideoFrameSource'; +import { getDefaultConversationWithServiceId } from '../test-helpers/getDefaultConversation'; +import { fakeGetGroupCallVideoFrameSource } from '../test-helpers/fakeGetGroupCallVideoFrameSource'; import { FRAME_BUFFER_SIZE } from '../calling/constants'; import { generateAci } from '../types/ServiceId'; import type { CallingImageDataCache } from './CallManager'; diff --git a/ts/components/GroupCallRemoteParticipant.stories.tsx b/ts/components/GroupCallRemoteParticipant.stories.tsx index ffc4337a55..680fd4d1be 100644 --- a/ts/components/GroupCallRemoteParticipant.stories.tsx +++ b/ts/components/GroupCallRemoteParticipant.stories.tsx @@ -6,7 +6,7 @@ import { memoize } from 'lodash'; import type { Meta } from '@storybook/react'; import type { PropsType } from './GroupCallRemoteParticipant'; import { GroupCallRemoteParticipant } from './GroupCallRemoteParticipant'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { FRAME_BUFFER_SIZE } from '../calling/constants'; import { generateAci } from '../types/ServiceId'; import type { CallingImageDataCache } from './CallManager'; diff --git a/ts/components/GroupV1MigrationDialog.stories.tsx b/ts/components/GroupV1MigrationDialog.stories.tsx index bc9fe09ccf..61696b269e 100644 --- a/ts/components/GroupV1MigrationDialog.stories.tsx +++ b/ts/components/GroupV1MigrationDialog.stories.tsx @@ -9,7 +9,7 @@ import type { Meta } from '@storybook/react'; import type { PropsType } from './GroupV1MigrationDialog'; import { GroupV1MigrationDialog } from './GroupV1MigrationDialog'; import type { ConversationType } from '../state/ducks/conversations'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { ThemeType } from '../types/Util'; const { i18n } = window.SignalContext; diff --git a/ts/components/IncomingCallBar.stories.tsx b/ts/components/IncomingCallBar.stories.tsx index 7efbad1795..263e8c87fb 100644 --- a/ts/components/IncomingCallBar.stories.tsx +++ b/ts/components/IncomingCallBar.stories.tsx @@ -7,7 +7,7 @@ import type { Meta } from '@storybook/react'; import type { PropsType } from './IncomingCallBar'; import { IncomingCallBar } from './IncomingCallBar'; import { CallMode } from '../types/CallDisposition'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/LeftPane.stories.tsx b/ts/components/LeftPane.stories.tsx index d0aa0ce6f2..82fe91d0d9 100644 --- a/ts/components/LeftPane.stories.tsx +++ b/ts/components/LeftPane.stories.tsx @@ -24,14 +24,14 @@ import { ThemeType } from '../types/Util'; import { getDefaultConversation, getDefaultGroupListItem, -} from '../test-both/helpers/getDefaultConversation'; +} from '../test-helpers/getDefaultConversation'; import { DialogType } from '../types/Dialogs'; import { SocketStatus } from '../types/SocketStatus'; import { StorybookThemeContext } from '../../.storybook/StorybookThemeContext'; import { makeFakeLookupConversationWithoutServiceId, useUuidFetchState, -} from '../test-both/helpers/fakeLookupConversationWithoutServiceId'; +} from '../test-helpers/fakeLookupConversationWithoutServiceId'; import type { GroupListItemConversationType } from './conversationList/GroupListItem'; import { ServerAlert } from '../util/handleServerAlerts'; diff --git a/ts/components/Lightbox.stories.tsx b/ts/components/Lightbox.stories.tsx index 1f41016240..26d5351f34 100644 --- a/ts/components/Lightbox.stories.tsx +++ b/ts/components/Lightbox.stories.tsx @@ -16,7 +16,7 @@ import { stringToMIMEType, } from '../types/MIME'; -import { fakeAttachment } from '../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../test-helpers/fakeAttachment'; const { i18n } = window.SignalContext; diff --git a/ts/components/MediaEditor.stories.tsx b/ts/components/MediaEditor.stories.tsx index 98a604e9f1..e6eb29e00d 100644 --- a/ts/components/MediaEditor.stories.tsx +++ b/ts/components/MediaEditor.stories.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import type { PropsType } from './MediaEditor'; import { MediaEditor } from './MediaEditor'; -import { Stickers, installedPacks } from '../test-both/helpers/getStickerPacks'; +import { Stickers, installedPacks } from '../test-helpers/getStickerPacks'; import { EmojiSkinTone } from './fun/data/emojis'; const { i18n } = window.SignalContext; diff --git a/ts/components/MyStories.stories.tsx b/ts/components/MyStories.stories.tsx index 75c1d91688..7243df64c0 100644 --- a/ts/components/MyStories.stories.tsx +++ b/ts/components/MyStories.stories.tsx @@ -12,8 +12,8 @@ import type { PropsType } from './MyStories'; import { MY_STORY_ID } from '../types/Stories'; import { MyStories } from './MyStories'; import { SendStatus } from '../messages/MessageSendState'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; -import { getFakeMyStory } from '../test-both/helpers/getFakeStory'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; +import { getFakeMyStory } from '../test-helpers/getFakeStory'; import { sleep } from '../util/sleep'; const { i18n } = window.SignalContext; diff --git a/ts/components/MyStoryButton.stories.tsx b/ts/components/MyStoryButton.stories.tsx index 765d68d678..e10df0d9d9 100644 --- a/ts/components/MyStoryButton.stories.tsx +++ b/ts/components/MyStoryButton.stories.tsx @@ -9,8 +9,8 @@ import { expect, fn, within, userEvent } from '@storybook/test'; import { action } from '@storybook/addon-actions'; import type { PropsType } from './MyStoryButton'; import { MyStoryButton } from './MyStoryButton'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; -import { getFakeMyStory } from '../test-both/helpers/getFakeStory'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; +import { getFakeMyStory } from '../test-helpers/getFakeStory'; import { SendStatus } from '../messages/MessageSendState'; import { ResolvedSendStatus } from '../types/Stories'; diff --git a/ts/components/NavTabs.stories.tsx b/ts/components/NavTabs.stories.tsx index 972f61cdeb..486d626b6d 100644 --- a/ts/components/NavTabs.stories.tsx +++ b/ts/components/NavTabs.stories.tsx @@ -8,7 +8,7 @@ import type { Meta } from '@storybook/react'; import type { NavTabsProps } from './NavTabs'; import { NavTabs } from './NavTabs'; import { NavTab } from '../state/ducks/nav'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { ThemeType } from '../types/Util'; const { i18n } = window.SignalContext; diff --git a/ts/components/NewlyCreatedGroupInvitedContactsDialog.stories.tsx b/ts/components/NewlyCreatedGroupInvitedContactsDialog.stories.tsx index 982c50cf6d..a2c5c707c6 100644 --- a/ts/components/NewlyCreatedGroupInvitedContactsDialog.stories.tsx +++ b/ts/components/NewlyCreatedGroupInvitedContactsDialog.stories.tsx @@ -9,7 +9,7 @@ import type { Meta } from '@storybook/react'; import type { PropsType } from './NewlyCreatedGroupInvitedContactsDialog'; import { NewlyCreatedGroupInvitedContactsDialog } from './NewlyCreatedGroupInvitedContactsDialog'; import type { ConversationType } from '../state/ducks/conversations'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { ThemeType } from '../types/Util'; const { i18n } = window.SignalContext; diff --git a/ts/components/NotePreviewModal.stories.tsx b/ts/components/NotePreviewModal.stories.tsx index 517c877c9d..f1de0847d0 100644 --- a/ts/components/NotePreviewModal.stories.tsx +++ b/ts/components/NotePreviewModal.stories.tsx @@ -3,7 +3,7 @@ import { action } from '@storybook/addon-actions'; import * as React from 'react'; import type { ComponentMeta } from '../storybook/types'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { NotePreviewModal, type NotePreviewModalProps, diff --git a/ts/components/Preferences.stories.tsx b/ts/components/Preferences.stories.tsx index c89b76a141..86f26bdbb1 100644 --- a/ts/components/Preferences.stories.tsx +++ b/ts/components/Preferences.stories.tsx @@ -18,7 +18,7 @@ import { ThemeType } from '../types/Util'; import { getDefaultConversation, getDefaultGroup, -} from '../test-both/helpers/getDefaultConversation'; +} from '../test-helpers/getDefaultConversation'; import { EditState, ProfileEditor } from './ProfileEditor'; import { UsernameEditState, diff --git a/ts/components/ProfileEditor.stories.tsx b/ts/components/ProfileEditor.stories.tsx index 8e3477c7a7..9154ac9385 100644 --- a/ts/components/ProfileEditor.stories.tsx +++ b/ts/components/ProfileEditor.stories.tsx @@ -15,7 +15,7 @@ import { UsernameLinkState, UsernameReservationState, } from '../state/ducks/usernameEnums'; -import { getRandomColor } from '../test-both/helpers/getRandomColor'; +import { getRandomColor } from '../test-helpers/getRandomColor'; import { SignalService as Proto } from '../protobuf'; import { EmojiSkinTone } from './fun/data/emojis'; diff --git a/ts/components/SafetyNumberChangeDialog.stories.tsx b/ts/components/SafetyNumberChangeDialog.stories.tsx index 0440978932..9e6054bfef 100644 --- a/ts/components/SafetyNumberChangeDialog.stories.tsx +++ b/ts/components/SafetyNumberChangeDialog.stories.tsx @@ -6,9 +6,9 @@ import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; import type { Props } from './SafetyNumberChangeDialog'; import { SafetyNumberChangeDialog } from './SafetyNumberChangeDialog'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { StorybookThemeContext } from '../../.storybook/StorybookThemeContext'; -import { getFakeBadge } from '../test-both/helpers/getFakeBadge'; +import { getFakeBadge } from '../test-helpers/getFakeBadge'; import { MY_STORY_ID } from '../types/Stories'; import { generateStoryDistributionId } from '../types/StoryDistributionId'; diff --git a/ts/components/SafetyNumberViewer.stories.tsx b/ts/components/SafetyNumberViewer.stories.tsx index 4545931051..d7f16c6c55 100644 --- a/ts/components/SafetyNumberViewer.stories.tsx +++ b/ts/components/SafetyNumberViewer.stories.tsx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; import type { PropsType } from './SafetyNumberViewer'; import { SafetyNumberViewer } from './SafetyNumberViewer'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; function generateQRData() { const data = new Uint8Array(128); diff --git a/ts/components/SendStoryModal.stories.tsx b/ts/components/SendStoryModal.stories.tsx index dfdd885d2f..a40ede7c2d 100644 --- a/ts/components/SendStoryModal.stories.tsx +++ b/ts/components/SendStoryModal.stories.tsx @@ -10,11 +10,11 @@ import { SendStoryModal } from './SendStoryModal'; import { getDefaultConversation, getDefaultGroup, -} from '../test-both/helpers/getDefaultConversation'; +} from '../test-helpers/getDefaultConversation'; import { getMyStories, getFakeDistributionListsWithMembers, -} from '../test-both/helpers/getFakeDistributionLists'; +} from '../test-helpers/getFakeDistributionLists'; import { VIDEO_MP4 } from '../types/MIME'; import type { StoryDistributionIdString } from '../types/StoryDistributionId'; diff --git a/ts/components/StoriesSettingsModal.stories.tsx b/ts/components/StoriesSettingsModal.stories.tsx index 3638287f51..34470286c1 100644 --- a/ts/components/StoriesSettingsModal.stories.tsx +++ b/ts/components/StoriesSettingsModal.stories.tsx @@ -10,11 +10,11 @@ import { StoriesSettingsModal } from './StoriesSettingsModal'; import { getDefaultConversation, getDefaultGroup, -} from '../test-both/helpers/getDefaultConversation'; +} from '../test-helpers/getDefaultConversation'; import { getMyStories, getFakeDistributionList, -} from '../test-both/helpers/getFakeDistributionLists'; +} from '../test-helpers/getFakeDistributionLists'; const { i18n } = window.SignalContext; diff --git a/ts/components/StoriesTab.stories.tsx b/ts/components/StoriesTab.stories.tsx index 1c3bac3c6d..e54625ba75 100644 --- a/ts/components/StoriesTab.stories.tsx +++ b/ts/components/StoriesTab.stories.tsx @@ -7,11 +7,8 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import type { PropsType } from './StoriesTab'; import { StoriesTab } from './StoriesTab'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; -import { - getFakeMyStory, - getFakeStory, -} from '../test-both/helpers/getFakeStory'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; +import { getFakeMyStory, getFakeStory } from '../test-helpers/getFakeStory'; import * as durations from '../util/durations'; const { i18n } = window.SignalContext; diff --git a/ts/components/StoryCreator.stories.tsx b/ts/components/StoryCreator.stories.tsx index 3105c06a7b..6fdf5bf4e9 100644 --- a/ts/components/StoryCreator.stories.tsx +++ b/ts/components/StoryCreator.stories.tsx @@ -7,12 +7,12 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import type { PropsType } from './StoryCreator'; import { StoryCreator } from './StoryCreator'; -import { fakeAttachment } from '../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../test-helpers/fakeAttachment'; import { getDefaultConversation, getDefaultGroup, -} from '../test-both/helpers/getDefaultConversation'; -import { getFakeDistributionListsWithMembers } from '../test-both/helpers/getFakeDistributionLists'; +} from '../test-helpers/getDefaultConversation'; +import { getFakeDistributionListsWithMembers } from '../test-helpers/getFakeDistributionLists'; import { EmojiSkinTone } from './fun/data/emojis'; const { i18n } = window.SignalContext; diff --git a/ts/components/StoryDetailsModal.stories.tsx b/ts/components/StoryDetailsModal.stories.tsx index ba41701fce..b73ebdcdd4 100644 --- a/ts/components/StoryDetailsModal.stories.tsx +++ b/ts/components/StoryDetailsModal.stories.tsx @@ -9,7 +9,7 @@ import { action } from '@storybook/addon-actions'; import type { PropsType } from './StoryDetailsModal'; import { SendStatus } from '../messages/MessageSendState'; import { StoryDetailsModal } from './StoryDetailsModal'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/StoryImage.stories.tsx b/ts/components/StoryImage.stories.tsx index 665d208ae6..ae2103ca2f 100644 --- a/ts/components/StoryImage.stories.tsx +++ b/ts/components/StoryImage.stories.tsx @@ -9,10 +9,7 @@ import { noop } from 'lodash'; import type { Meta } from '@storybook/react'; import type { PropsType } from './StoryImage'; import { StoryImage } from './StoryImage'; -import { - fakeAttachment, - fakeThumbnail, -} from '../test-both/helpers/fakeAttachment'; +import { fakeAttachment, fakeThumbnail } from '../test-helpers/fakeAttachment'; import { VIDEO_MP4 } from '../types/MIME'; const { i18n } = window.SignalContext; diff --git a/ts/components/StoryLinkPreview.stories.tsx b/ts/components/StoryLinkPreview.stories.tsx index 1764505bbc..54a014fcc0 100644 --- a/ts/components/StoryLinkPreview.stories.tsx +++ b/ts/components/StoryLinkPreview.stories.tsx @@ -6,7 +6,7 @@ import React from 'react'; import type { Props } from './StoryLinkPreview'; import { StoryLinkPreview } from './StoryLinkPreview'; -import { fakeAttachment } from '../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../test-helpers/fakeAttachment'; import { IMAGE_JPEG } from '../types/MIME'; const LONG_TITLE = diff --git a/ts/components/StoryListItem.stories.tsx b/ts/components/StoryListItem.stories.tsx index 0ca29c97ff..ea4f26175c 100644 --- a/ts/components/StoryListItem.stories.tsx +++ b/ts/components/StoryListItem.stories.tsx @@ -7,11 +7,8 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import type { PropsType } from './StoryListItem'; import { StoryListItem } from './StoryListItem'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; -import { - fakeAttachment, - fakeThumbnail, -} from '../test-both/helpers/fakeAttachment'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; +import { fakeAttachment, fakeThumbnail } from '../test-helpers/fakeAttachment'; const { i18n } = window.SignalContext; diff --git a/ts/components/StoryViewer.stories.tsx b/ts/components/StoryViewer.stories.tsx index 001d5cef3c..8997c18f1a 100644 --- a/ts/components/StoryViewer.stories.tsx +++ b/ts/components/StoryViewer.stories.tsx @@ -10,9 +10,9 @@ import { StoryViewModeType } from '../types/Stories'; import { generateStoryDistributionId } from '../types/StoryDistributionId'; import { StoryViewer } from './StoryViewer'; import { VIDEO_MP4 } from '../types/MIME'; -import { fakeAttachment } from '../test-both/helpers/fakeAttachment'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; -import { getFakeStoryView } from '../test-both/helpers/getFakeStory'; +import { fakeAttachment } from '../test-helpers/fakeAttachment'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; +import { getFakeStoryView } from '../test-helpers/getFakeStory'; import { DEFAULT_PREFERRED_REACTION_EMOJI } from '../reactions/constants'; import { EmojiSkinTone } from './fun/data/emojis'; diff --git a/ts/components/StoryViewsNRepliesModal.stories.tsx b/ts/components/StoryViewsNRepliesModal.stories.tsx index 5e73e806e9..04d2212d84 100644 --- a/ts/components/StoryViewsNRepliesModal.stories.tsx +++ b/ts/components/StoryViewsNRepliesModal.stories.tsx @@ -10,7 +10,7 @@ import type { PropsType } from './StoryViewsNRepliesModal'; import * as durations from '../util/durations'; import { SendStatus } from '../messages/MessageSendState'; import { StoryViewsNRepliesModal } from './StoryViewsNRepliesModal'; -import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../test-helpers/getDefaultConversation'; import { StoryViewTargetType } from '../types/Stories'; import { DEFAULT_PREFERRED_REACTION_EMOJI } from '../reactions/constants'; diff --git a/ts/components/UnsupportedOSDialog.stories.tsx b/ts/components/UnsupportedOSDialog.stories.tsx index 7bf143d07e..a136c65b37 100644 --- a/ts/components/UnsupportedOSDialog.stories.tsx +++ b/ts/components/UnsupportedOSDialog.stories.tsx @@ -7,7 +7,7 @@ import { UnsupportedOSDialog } from './UnsupportedOSDialog'; import type { PropsType } from './UnsupportedOSDialog'; import { DAY } from '../util/durations'; import { WidthBreakpoint } from './_util'; -import { FakeLeftPaneContainer } from '../test-both/helpers/FakeLeftPaneContainer'; +import { FakeLeftPaneContainer } from '../test-helpers/FakeLeftPaneContainer'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/AboutContactModal.stories.tsx b/ts/components/conversation/AboutContactModal.stories.tsx index fad324b739..7e6b74f305 100644 --- a/ts/components/conversation/AboutContactModal.stories.tsx +++ b/ts/components/conversation/AboutContactModal.stories.tsx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; import type { PropsType } from './AboutContactModal'; import { AboutContactModal } from './AboutContactModal'; import { type ComponentMeta } from '../../storybook/types'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/AttachmentDetailPill.stories.tsx b/ts/components/conversation/AttachmentDetailPill.stories.tsx index bb76826a05..2894e94d42 100644 --- a/ts/components/conversation/AttachmentDetailPill.stories.tsx +++ b/ts/components/conversation/AttachmentDetailPill.stories.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import { type PropsType, AttachmentDetailPill } from './AttachmentDetailPill'; import { type ComponentMeta } from '../../storybook/types'; -import { fakeAttachment } from '../../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../../test-helpers/fakeAttachment'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/AttachmentList.stories.tsx b/ts/components/conversation/AttachmentList.stories.tsx index 3da82db2ad..21073fa2a0 100644 --- a/ts/components/conversation/AttachmentList.stories.tsx +++ b/ts/components/conversation/AttachmentList.stories.tsx @@ -17,7 +17,7 @@ import { VIDEO_MP4, stringToMIMEType, } from '../../types/MIME'; -import { fakeDraftAttachment } from '../../test-both/helpers/fakeAttachment'; +import { fakeDraftAttachment } from '../../test-helpers/fakeAttachment'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/AttachmentStatusIcon.stories.tsx b/ts/components/conversation/AttachmentStatusIcon.stories.tsx index 401715ed75..bbc32507d2 100644 --- a/ts/components/conversation/AttachmentStatusIcon.stories.tsx +++ b/ts/components/conversation/AttachmentStatusIcon.stories.tsx @@ -5,7 +5,7 @@ import React, { useCallback, useRef, useState } from 'react'; import type { Meta } from '@storybook/react'; import type { PropsType } from './AttachmentStatusIcon'; import { AttachmentStatusIcon } from './AttachmentStatusIcon'; -import { fakeAttachment } from '../../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../../test-helpers/fakeAttachment'; export default { title: 'Components/Conversation/AttachmentStatusIcon', diff --git a/ts/components/conversation/CallingNotification.stories.tsx b/ts/components/conversation/CallingNotification.stories.tsx index 044557a550..5adcde0845 100644 --- a/ts/components/conversation/CallingNotification.stories.tsx +++ b/ts/components/conversation/CallingNotification.stories.tsx @@ -16,7 +16,7 @@ import { CallingNotification, type PropsType } from './CallingNotification'; import { getDefaultConversation, getDefaultGroup, -} from '../../test-both/helpers/getDefaultConversation'; +} from '../../test-helpers/getDefaultConversation'; import type { CallStatus } from '../../types/CallDisposition'; import type { ConversationType } from '../../state/ducks/conversations'; diff --git a/ts/components/conversation/ChangeNumberNotification.stories.tsx b/ts/components/conversation/ChangeNumberNotification.stories.tsx index 881a0a6099..34203fd0c0 100644 --- a/ts/components/conversation/ChangeNumberNotification.stories.tsx +++ b/ts/components/conversation/ChangeNumberNotification.stories.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import type { Meta } from '@storybook/react'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import type { Props } from './ChangeNumberNotification'; import { ChangeNumberNotification } from './ChangeNumberNotification'; diff --git a/ts/components/conversation/ContactDetail.stories.tsx b/ts/components/conversation/ContactDetail.stories.tsx index d848a3a66e..fc0ee13f0c 100644 --- a/ts/components/conversation/ContactDetail.stories.tsx +++ b/ts/components/conversation/ContactDetail.stories.tsx @@ -8,7 +8,7 @@ import type { Props } from './ContactDetail'; import { ContactDetail } from './ContactDetail'; import { AddressType, ContactFormType } from '../../types/EmbeddedContact'; import { IMAGE_GIF } from '../../types/MIME'; -import { fakeAttachment } from '../../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../../test-helpers/fakeAttachment'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/ContactModal.stories.tsx b/ts/components/conversation/ContactModal.stories.tsx index 96580dba77..2c4692a51e 100644 --- a/ts/components/conversation/ContactModal.stories.tsx +++ b/ts/components/conversation/ContactModal.stories.tsx @@ -10,8 +10,8 @@ import type { PropsType } from './ContactModal'; import { ContactModal } from './ContactModal'; import { HasStories } from '../../types/Stories'; import { ThemeType } from '../../types/Util'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; -import { getFakeBadges } from '../../test-both/helpers/getFakeBadge'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; +import { getFakeBadges } from '../../test-helpers/getFakeBadge'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/ContactSpoofingReviewDialog.stories.tsx b/ts/components/conversation/ContactSpoofingReviewDialog.stories.tsx index 931431d1d4..e56d72d095 100644 --- a/ts/components/conversation/ContactSpoofingReviewDialog.stories.tsx +++ b/ts/components/conversation/ContactSpoofingReviewDialog.stories.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { times } from 'lodash'; import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import type { PropsType } from './ContactSpoofingReviewDialog'; import { ContactSpoofingReviewDialog } from './ContactSpoofingReviewDialog'; import { ContactSpoofingType } from '../../util/contactSpoofing'; diff --git a/ts/components/conversation/ContactSpoofingReviewDialogPerson.stories.tsx b/ts/components/conversation/ContactSpoofingReviewDialogPerson.stories.tsx index 8ac9848f59..b16fe83fb5 100644 --- a/ts/components/conversation/ContactSpoofingReviewDialogPerson.stories.tsx +++ b/ts/components/conversation/ContactSpoofingReviewDialogPerson.stories.tsx @@ -6,7 +6,7 @@ import type { Meta, StoryFn } from '@storybook/react'; import { action } from '@storybook/addon-actions'; import { ThemeType } from '../../types/Util'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import type { PropsType } from './ContactSpoofingReviewDialogPerson'; import { ContactSpoofingReviewDialogPerson } from './ContactSpoofingReviewDialogPerson'; diff --git a/ts/components/conversation/ConversationHeader.stories.tsx b/ts/components/conversation/ConversationHeader.stories.tsx index 31a183d5a5..27a1177756 100644 --- a/ts/components/conversation/ConversationHeader.stories.tsx +++ b/ts/components/conversation/ConversationHeader.stories.tsx @@ -8,8 +8,8 @@ import type { Meta } from '@storybook/react'; import { getDefaultConversation, getDefaultGroup, -} from '../../test-both/helpers/getDefaultConversation'; -import { getRandomColor } from '../../test-both/helpers/getRandomColor'; +} from '../../test-helpers/getDefaultConversation'; +import { getRandomColor } from '../../test-helpers/getRandomColor'; import { DurationInSeconds } from '../../util/durations'; import { StorybookThemeContext } from '../../../.storybook/StorybookThemeContext'; import type { PropsType } from './ConversationHeader'; diff --git a/ts/components/conversation/ConversationHero.stories.tsx b/ts/components/conversation/ConversationHero.stories.tsx index 5107c89379..09644001ee 100644 --- a/ts/components/conversation/ConversationHero.stories.tsx +++ b/ts/components/conversation/ConversationHero.stories.tsx @@ -9,7 +9,7 @@ import type { Props } from './ConversationHero'; import { ConversationHero } from './ConversationHero'; import { HasStories } from '../../types/Stories'; import { StorybookThemeContext } from '../../../.storybook/StorybookThemeContext'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { ThemeType } from '../../types/Util'; import type { GroupV2Membership } from './conversation-details/ConversationDetailsMembershipList'; diff --git a/ts/components/conversation/DeliveryIssueDialog.stories.tsx b/ts/components/conversation/DeliveryIssueDialog.stories.tsx index 474d61ce08..e699303ba5 100644 --- a/ts/components/conversation/DeliveryIssueDialog.stories.tsx +++ b/ts/components/conversation/DeliveryIssueDialog.stories.tsx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; import type { PropsType } from './DeliveryIssueDialog'; import { DeliveryIssueDialog } from './DeliveryIssueDialog'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; const sender = getDefaultConversation(); diff --git a/ts/components/conversation/DeliveryIssueNotification.stories.tsx b/ts/components/conversation/DeliveryIssueNotification.stories.tsx index 9eae5110a5..479bb57b8f 100644 --- a/ts/components/conversation/DeliveryIssueNotification.stories.tsx +++ b/ts/components/conversation/DeliveryIssueNotification.stories.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import type { Meta } from '@storybook/react'; import type { PropsType } from './DeliveryIssueNotification'; import { DeliveryIssueNotification } from './DeliveryIssueNotification'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; export default { title: 'Components/Conversation/DeliveryIssueNotification', diff --git a/ts/components/conversation/GroupNotification.stories.tsx b/ts/components/conversation/GroupNotification.stories.tsx index f6d9150462..23b0979fb9 100644 --- a/ts/components/conversation/GroupNotification.stories.tsx +++ b/ts/components/conversation/GroupNotification.stories.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import type { Meta } from '@storybook/react'; import type { Props } from './GroupNotification'; import { GroupNotification } from './GroupNotification'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; export default { title: 'Components/Conversation', diff --git a/ts/components/conversation/GroupV1Migration.stories.tsx b/ts/components/conversation/GroupV1Migration.stories.tsx index 49424db1c4..21e85c19c5 100644 --- a/ts/components/conversation/GroupV1Migration.stories.tsx +++ b/ts/components/conversation/GroupV1Migration.stories.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import type { Meta } from '@storybook/react'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import type { PropsType } from './GroupV1Migration'; import { GroupV1Migration } from './GroupV1Migration'; import { ThemeType } from '../../types/Util'; diff --git a/ts/components/conversation/Image.stories.tsx b/ts/components/conversation/Image.stories.tsx index 25e8b43368..6a49a4bac5 100644 --- a/ts/components/conversation/Image.stories.tsx +++ b/ts/components/conversation/Image.stories.tsx @@ -11,7 +11,7 @@ import { IMAGE_PNG } from '../../types/MIME'; import type { ThemeType } from '../../types/Util'; import { StorybookThemeContext } from '../../../.storybook/StorybookThemeContext'; -import { fakeAttachment } from '../../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../../test-helpers/fakeAttachment'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/ImageGrid.stories.tsx b/ts/components/conversation/ImageGrid.stories.tsx index e415e04498..4c9edb87c6 100644 --- a/ts/components/conversation/ImageGrid.stories.tsx +++ b/ts/components/conversation/ImageGrid.stories.tsx @@ -15,7 +15,7 @@ import { stringToMIMEType, } from '../../types/MIME'; import { pngUrl, squareStickerUrl } from '../../storybook/Fixtures'; -import { fakeAttachment } from '../../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../../test-helpers/fakeAttachment'; import { strictAssert } from '../../util/assert'; import { isDownloadable } from '../../types/Attachment'; diff --git a/ts/components/conversation/MandatoryProfileSharingActions.stories.tsx b/ts/components/conversation/MandatoryProfileSharingActions.stories.tsx index 0af7b9dd19..619e3d4bdf 100644 --- a/ts/components/conversation/MandatoryProfileSharingActions.stories.tsx +++ b/ts/components/conversation/MandatoryProfileSharingActions.stories.tsx @@ -9,7 +9,7 @@ import { MandatoryProfileSharingActions } from './MandatoryProfileSharingActions import { getDefaultConversation, getDefaultGroup, -} from '../../test-both/helpers/getDefaultConversation'; +} from '../../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/MessageDetail.stories.tsx b/ts/components/conversation/MessageDetail.stories.tsx index d733af246e..3bac02ec06 100644 --- a/ts/components/conversation/MessageDetail.stories.tsx +++ b/ts/components/conversation/MessageDetail.stories.tsx @@ -10,8 +10,8 @@ import type { Props } from './MessageDetail'; import { MessageDetail } from './MessageDetail'; import { SendStatus } from '../../messages/MessageSendState'; import { ReadStatus } from '../../messages/MessageReadStatus'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; -import { getFakeBadge } from '../../test-both/helpers/getFakeBadge'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; +import { getFakeBadge } from '../../test-helpers/getFakeBadge'; import { ThemeType } from '../../types/Util'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/MessageRequestActions.stories.tsx b/ts/components/conversation/MessageRequestActions.stories.tsx index 42fb555a59..a5e4b16c9d 100644 --- a/ts/components/conversation/MessageRequestActions.stories.tsx +++ b/ts/components/conversation/MessageRequestActions.stories.tsx @@ -8,7 +8,7 @@ import { MessageRequestActions } from './MessageRequestActions'; import { getDefaultConversation, getDefaultGroup, -} from '../../test-both/helpers/getDefaultConversation'; +} from '../../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/ProfileChangeNotification.stories.tsx b/ts/components/conversation/ProfileChangeNotification.stories.tsx index 1af6612af2..81ffd9ab82 100644 --- a/ts/components/conversation/ProfileChangeNotification.stories.tsx +++ b/ts/components/conversation/ProfileChangeNotification.stories.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import type { Meta } from '@storybook/react'; import { action } from '@storybook/addon-actions'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import type { PropsType } from './ProfileChangeNotification'; import { ProfileChangeNotification } from './ProfileChangeNotification'; diff --git a/ts/components/conversation/Quote.stories.tsx b/ts/components/conversation/Quote.stories.tsx index c9d5d90645..eb78735ea3 100644 --- a/ts/components/conversation/Quote.stories.tsx +++ b/ts/components/conversation/Quote.stories.tsx @@ -21,7 +21,7 @@ import { import type { Props } from './Quote'; import { Quote } from './Quote'; import { ReadStatus } from '../../messages/MessageReadStatus'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { WidthBreakpoint } from '../_util'; import { ThemeType } from '../../types/Util'; import { PaymentEventKind } from '../../types/Payment'; diff --git a/ts/components/conversation/ReactionViewer.stories.tsx b/ts/components/conversation/ReactionViewer.stories.tsx index e3d46bd215..265368713e 100644 --- a/ts/components/conversation/ReactionViewer.stories.tsx +++ b/ts/components/conversation/ReactionViewer.stories.tsx @@ -6,7 +6,7 @@ import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; import type { Props } from './ReactionViewer'; import { ReactionViewer } from './ReactionViewer'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { ThemeType } from '../../types/Util'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/StagedLinkPreview.stories.tsx b/ts/components/conversation/StagedLinkPreview.stories.tsx index facf813186..9037b30d76 100644 --- a/ts/components/conversation/StagedLinkPreview.stories.tsx +++ b/ts/components/conversation/StagedLinkPreview.stories.tsx @@ -7,7 +7,7 @@ import { action } from '@storybook/addon-actions'; import type { Props } from './StagedLinkPreview'; import { StagedLinkPreview } from './StagedLinkPreview'; -import { fakeAttachment } from '../../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../../test-helpers/fakeAttachment'; import { IMAGE_JPEG } from '../../types/MIME'; const LONG_TITLE = diff --git a/ts/components/conversation/Timeline.stories.tsx b/ts/components/conversation/Timeline.stories.tsx index 3264c97a92..427f9f8a1f 100644 --- a/ts/components/conversation/Timeline.stories.tsx +++ b/ts/components/conversation/Timeline.stories.tsx @@ -13,7 +13,7 @@ import type { TimelineItemType } from './TimelineItem'; import { TimelineItem } from './TimelineItem'; import { StorybookThemeContext } from '../../../.storybook/StorybookThemeContext'; import { ConversationHero } from './ConversationHero'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { TypingBubble } from './TypingBubble'; import { ContactSpoofingType } from '../../util/contactSpoofing'; import { ReadStatus } from '../../messages/MessageReadStatus'; diff --git a/ts/components/conversation/TimelineItem.stories.tsx b/ts/components/conversation/TimelineItem.stories.tsx index 525d9c63cd..5f99a50a2a 100644 --- a/ts/components/conversation/TimelineItem.stories.tsx +++ b/ts/components/conversation/TimelineItem.stories.tsx @@ -11,7 +11,7 @@ import { TimelineItem } from './TimelineItem'; import { UniversalTimerNotification } from './UniversalTimerNotification'; import { CallMode } from '../../types/CallDisposition'; import { AvatarColors } from '../../types/Colors'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { WidthBreakpoint } from '../_util'; import { ThemeType } from '../../types/Util'; import { PaymentEventKind } from '../../types/Payment'; diff --git a/ts/components/conversation/TimelineMessage.stories.tsx b/ts/components/conversation/TimelineMessage.stories.tsx index 0c630908c8..eaa180b81b 100644 --- a/ts/components/conversation/TimelineMessage.stories.tsx +++ b/ts/components/conversation/TimelineMessage.stories.tsx @@ -28,7 +28,7 @@ import { ReadStatus } from '../../messages/MessageReadStatus'; import { MessageAudio } from './MessageAudio'; import { computePeaks } from '../VoiceNotesPlaybackContext'; import { pngUrl } from '../../storybook/Fixtures'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { WidthBreakpoint } from '../_util'; import { DAY, HOUR, MINUTE, SECOND } from '../../util/durations'; import { ContactFormType } from '../../types/EmbeddedContact'; @@ -37,8 +37,8 @@ import { generateAci } from '../../types/ServiceId'; import { fakeAttachment, fakeThumbnail, -} from '../../test-both/helpers/fakeAttachment'; -import { getFakeBadge } from '../../test-both/helpers/getFakeBadge'; +} from '../../test-helpers/fakeAttachment'; +import { getFakeBadge } from '../../test-helpers/getFakeBadge'; import { ThemeType } from '../../types/Util'; import { BadgeCategory } from '../../badges/BadgeCategory'; import { PaymentEventKind } from '../../types/Payment'; diff --git a/ts/components/conversation/TypingBubble.stories.tsx b/ts/components/conversation/TypingBubble.stories.tsx index 7adfcb0eaa..71c5d2090c 100644 --- a/ts/components/conversation/TypingBubble.stories.tsx +++ b/ts/components/conversation/TypingBubble.stories.tsx @@ -5,11 +5,11 @@ import React, { useEffect, useState } from 'react'; import { times } from 'lodash'; import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import type { TypingBubblePropsType } from './TypingBubble'; import { TypingBubble } from './TypingBubble'; import { AvatarColors } from '../../types/Colors'; -import { getFakeBadge } from '../../test-both/helpers/getFakeBadge'; +import { getFakeBadge } from '../../test-helpers/getFakeBadge'; import { ThemeType } from '../../types/Util'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/UniversalTimerNotification.stories.tsx b/ts/components/conversation/UniversalTimerNotification.stories.tsx index 4a601463c6..47b630e310 100644 --- a/ts/components/conversation/UniversalTimerNotification.stories.tsx +++ b/ts/components/conversation/UniversalTimerNotification.stories.tsx @@ -5,7 +5,7 @@ import React from 'react'; import type { Meta } from '@storybook/react'; import type { Props } from './UniversalTimerNotification'; import { UniversalTimerNotification } from './UniversalTimerNotification'; -import { EXPIRE_TIMERS } from '../../test-both/util/expireTimers'; +import { EXPIRE_TIMERS } from '../../test-helpers/expireTimers'; export default { title: 'Components/UniversalTimerNotification', diff --git a/ts/components/conversation/conversation-details/AddGroupMembersModal.stories.tsx b/ts/components/conversation/conversation-details/AddGroupMembersModal.stories.tsx index dfcf109905..6dfb1fcbf0 100644 --- a/ts/components/conversation/conversation-details/AddGroupMembersModal.stories.tsx +++ b/ts/components/conversation/conversation-details/AddGroupMembersModal.stories.tsx @@ -10,13 +10,13 @@ import { sleep } from '../../../util/sleep'; import { makeLookup } from '../../../util/makeLookup'; import { deconstructLookup } from '../../../util/deconstructLookup'; import type { ConversationType } from '../../../state/ducks/conversations'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import { AddGroupMembersModal } from './AddGroupMembersModal'; import { ChooseGroupMembersModal } from './AddGroupMembersModal/ChooseGroupMembersModal'; import { ConfirmAdditionsModal } from './AddGroupMembersModal/ConfirmAdditionsModal'; import { RequestState } from './util'; import { ThemeType } from '../../../types/Util'; -import { makeFakeLookupConversationWithoutServiceId } from '../../../test-both/helpers/fakeLookupConversationWithoutServiceId'; +import { makeFakeLookupConversationWithoutServiceId } from '../../../test-helpers/fakeLookupConversationWithoutServiceId'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx b/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx index db313d8c0e..2111d62846 100644 --- a/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx +++ b/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx @@ -12,12 +12,12 @@ import { ConversationDetails } from './ConversationDetails'; import { ChooseGroupMembersModal } from './AddGroupMembersModal/ChooseGroupMembersModal'; import { ConfirmAdditionsModal } from './AddGroupMembersModal/ConfirmAdditionsModal'; import type { ConversationType } from '../../../state/ducks/conversations'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; -import { makeFakeLookupConversationWithoutServiceId } from '../../../test-both/helpers/fakeLookupConversationWithoutServiceId'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; +import { makeFakeLookupConversationWithoutServiceId } from '../../../test-helpers/fakeLookupConversationWithoutServiceId'; import { ThemeType } from '../../../types/Util'; import { DurationInSeconds } from '../../../util/durations'; import { NavTab } from '../../../state/ducks/nav'; -import { getFakeCallHistoryGroup } from '../../../test-both/helpers/getFakeCallHistoryGroup'; +import { getFakeCallHistoryGroup } from '../../../test-helpers/getFakeCallHistoryGroup'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx b/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx index f0df4b94e7..d98e1c1b2f 100644 --- a/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx +++ b/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx @@ -4,8 +4,8 @@ import * as React from 'react'; import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; -import { getFakeBadges } from '../../../test-both/helpers/getFakeBadge'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; +import { getFakeBadges } from '../../../test-helpers/getFakeBadge'; import { StorybookThemeContext } from '../../../../.storybook/StorybookThemeContext'; import type { ConversationType } from '../../../state/ducks/conversations'; import type { Props } from './ConversationDetailsHeader'; diff --git a/ts/components/conversation/conversation-details/ConversationDetailsMediaList.stories.tsx b/ts/components/conversation/conversation-details/ConversationDetailsMediaList.stories.tsx index 2c6948ee12..bf781b194d 100644 --- a/ts/components/conversation/conversation-details/ConversationDetailsMediaList.stories.tsx +++ b/ts/components/conversation/conversation-details/ConversationDetailsMediaList.stories.tsx @@ -7,7 +7,7 @@ import type { Meta } from '@storybook/react'; import type { Props } from './ConversationDetailsMediaList'; import { ConversationDetailsMediaList } from './ConversationDetailsMediaList'; import type { MediaItemType } from '../../../types/MediaItem'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import { createPreparedMediaItems, createRandomMedia, diff --git a/ts/components/conversation/conversation-details/ConversationDetailsMembershipList.stories.tsx b/ts/components/conversation/conversation-details/ConversationDetailsMembershipList.stories.tsx index 6a70f91301..b381274444 100644 --- a/ts/components/conversation/conversation-details/ConversationDetailsMembershipList.stories.tsx +++ b/ts/components/conversation/conversation-details/ConversationDetailsMembershipList.stories.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import { ThemeType } from '../../../types/Util'; import type { diff --git a/ts/components/conversation/conversation-details/GroupLinkManagement.stories.tsx b/ts/components/conversation/conversation-details/GroupLinkManagement.stories.tsx index 000507f323..61a88a14ea 100644 --- a/ts/components/conversation/conversation-details/GroupLinkManagement.stories.tsx +++ b/ts/components/conversation/conversation-details/GroupLinkManagement.stories.tsx @@ -8,7 +8,7 @@ import type { PropsType } from './GroupLinkManagement'; import { GroupLinkManagement } from './GroupLinkManagement'; import { SignalService as Proto } from '../../../protobuf'; import type { ConversationType } from '../../../state/ducks/conversations'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/conversation-details/GroupV2Permissions.stories.tsx b/ts/components/conversation/conversation-details/GroupV2Permissions.stories.tsx index 5b3ba32c08..d1e2fe8dc5 100644 --- a/ts/components/conversation/conversation-details/GroupV2Permissions.stories.tsx +++ b/ts/components/conversation/conversation-details/GroupV2Permissions.stories.tsx @@ -7,7 +7,7 @@ import type { Meta } from '@storybook/react'; import type { PropsType } from './GroupV2Permissions'; import { GroupV2Permissions } from './GroupV2Permissions'; import type { ConversationType } from '../../../state/ducks/conversations'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversation/conversation-details/PendingInvites.stories.tsx b/ts/components/conversation/conversation-details/PendingInvites.stories.tsx index 5934e53438..23c4c197d8 100644 --- a/ts/components/conversation/conversation-details/PendingInvites.stories.tsx +++ b/ts/components/conversation/conversation-details/PendingInvites.stories.tsx @@ -10,8 +10,8 @@ import { StorySendMode } from '../../../types/Stories'; import type { PropsType } from './PendingInvites'; import { PendingInvites } from './PendingInvites'; import type { ConversationType } from '../../../state/ducks/conversations'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; -import { getFakeBadge } from '../../../test-both/helpers/getFakeBadge'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; +import { getFakeBadge } from '../../../test-helpers/getFakeBadge'; import { StorybookThemeContext } from '../../../../.storybook/StorybookThemeContext'; const { i18n } = window.SignalContext; diff --git a/ts/components/conversationList/MessageSearchResult.stories.tsx b/ts/components/conversationList/MessageSearchResult.stories.tsx index 969aa1013a..9af60d5123 100644 --- a/ts/components/conversationList/MessageSearchResult.stories.tsx +++ b/ts/components/conversationList/MessageSearchResult.stories.tsx @@ -6,10 +6,10 @@ import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; import { StorybookThemeContext } from '../../../.storybook/StorybookThemeContext'; import { strictAssert } from '../../util/assert'; -import { getFakeBadge } from '../../test-both/helpers/getFakeBadge'; +import { getFakeBadge } from '../../test-helpers/getFakeBadge'; import type { PropsType } from './MessageSearchResult'; import { MessageSearchResult } from './MessageSearchResult'; -import { getDefaultConversation } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { BodyRange } from '../../types/BodyRange'; import { generateAci } from '../../types/ServiceId'; diff --git a/ts/test-electron/quill/memberRepository_test.ts b/ts/test-electron/quill/memberRepository_test.ts index 8f0a318e44..5ea77f0e6d 100644 --- a/ts/test-electron/quill/memberRepository_test.ts +++ b/ts/test-electron/quill/memberRepository_test.ts @@ -7,7 +7,7 @@ import { generateAci } from '../../types/ServiceId'; import { isAciString } from '../../util/isAciString'; import type { ConversationType } from '../../state/ducks/conversations'; import { MemberRepository, _toMembers } from '../../quill/memberRepository'; -import { getDefaultConversationWithServiceId } from '../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversationWithServiceId } from '../../test-helpers/getDefaultConversation'; const UNKNOWN_SERVICE_ID = generateAci(); diff --git a/ts/test-electron/quill/mentions/completion_test.tsx b/ts/test-electron/quill/mentions/completion_test.tsx index 1126fa58de..9e2f1fa1d0 100644 --- a/ts/test-electron/quill/mentions/completion_test.tsx +++ b/ts/test-electron/quill/mentions/completion_test.tsx @@ -15,7 +15,7 @@ import type { ConversationType } from '../../../state/ducks/conversations'; import { MemberRepository, _toMembers } from '../../../quill/memberRepository'; import type { MemberType } from '../../../quill/memberRepository'; import { ThemeType } from '../../../types/Util'; -import { getDefaultConversationWithServiceId } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversationWithServiceId } from '../../../test-helpers/getDefaultConversation'; import { setupI18n } from '../../../util/setupI18n'; type MiniLeafBlot = { diff --git a/ts/test-electron/quill/mentions/matchers_test.ts b/ts/test-electron/quill/mentions/matchers_test.ts index 93ad035de5..e9c9756326 100644 --- a/ts/test-electron/quill/mentions/matchers_test.ts +++ b/ts/test-electron/quill/mentions/matchers_test.ts @@ -10,7 +10,7 @@ import { generateAci } from '../../../types/ServiceId'; import { matchMention } from '../../../quill/mentions/matchers'; import { MemberRepository } from '../../../quill/memberRepository'; import type { ConversationType } from '../../../state/ducks/conversations'; -import { getDefaultConversationWithServiceId } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversationWithServiceId } from '../../../test-helpers/getDefaultConversation'; const ACI_1 = generateAci(); diff --git a/ts/test-electron/sql/getCallHistoryGroups_test.ts b/ts/test-electron/sql/getCallHistoryGroups_test.ts index 90c9bcd351..4168a620be 100644 --- a/ts/test-electron/sql/getCallHistoryGroups_test.ts +++ b/ts/test-electron/sql/getCallHistoryGroups_test.ts @@ -26,7 +26,7 @@ import type { ConversationAttributesType } from '../../model-types'; import { FAKE_CALL_LINK, FAKE_CALL_LINK_WITH_ADMIN_KEY, -} from '../../test-both/helpers/fakeCallLink'; +} from '../../test-helpers/fakeCallLink'; const { getCallHistoryGroups, getCallHistoryGroupsCount } = DataReader; const { removeAll, insertCallLink, saveCallHistory, saveConversation } = diff --git a/ts/test-electron/state/ducks/calling_test.ts b/ts/test-electron/state/ducks/calling_test.ts index b477b05842..b2cdaf6743 100644 --- a/ts/test-electron/state/ducks/calling_test.ts +++ b/ts/test-electron/state/ducks/calling_test.ts @@ -40,13 +40,13 @@ import { } from '../../../types/Calling'; import { CallMode } from '../../../types/CallDisposition'; import { generateAci } from '../../../types/ServiceId'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import type { UnwrapPromise } from '../../../types/Util'; import { FAKE_CALL_LINK, FAKE_CALL_LINK_WITH_ADMIN_KEY, getCallLinkState, -} from '../../../test-both/helpers/fakeCallLink'; +} from '../../../test-helpers/fakeCallLink'; import { strictAssert } from '../../../util/assert'; import { callLinkRefreshJobQueue } from '../../../jobs/callLinkRefreshJobQueue'; import { CALL_LINK_DEFAULT_STATE } from '../../../util/callLinks'; diff --git a/ts/test-electron/state/ducks/conversations_test.ts b/ts/test-electron/state/ducks/conversations_test.ts index f34a183fb8..1b872cad08 100644 --- a/ts/test-electron/state/ducks/conversations_test.ts +++ b/ts/test-electron/state/ducks/conversations_test.ts @@ -49,14 +49,14 @@ import { getDefaultConversation, getDefaultConversationWithServiceId, getDefaultGroup, -} from '../../../test-both/helpers/getDefaultConversation'; +} from '../../../test-helpers/getDefaultConversation'; import { getDefaultAvatars } from '../../../types/Avatar'; import { defaultStartDirectConversationComposerState, defaultChooseGroupMembersComposerState, defaultSetGroupMetadataComposerState, -} from '../../../test-both/helpers/defaultComposerStates'; -import { updateRemoteConfig } from '../../../test-both/helpers/RemoteConfigStub'; +} from '../../../test-helpers/defaultComposerStates'; +import { updateRemoteConfig } from '../../../test-helpers/RemoteConfigStub'; import type { ShowSendAnywayDialogActionType } from '../../../state/ducks/globalModals'; import { SHOW_SEND_ANYWAY_DIALOG } from '../../../state/ducks/globalModals'; import type { StoryDistributionListsActionType } from '../../../state/ducks/storyDistributionLists'; diff --git a/ts/test-electron/state/selectors/calling_test.ts b/ts/test-electron/state/selectors/calling_test.ts index 5be2e57318..b167e77699 100644 --- a/ts/test-electron/state/selectors/calling_test.ts +++ b/ts/test-electron/state/selectors/calling_test.ts @@ -29,7 +29,7 @@ import { getEmptyState } from '../../../state/ducks/calling'; import { FAKE_CALL_LINK, FAKE_CALL_LINK_WITH_ADMIN_KEY, -} from '../../../test-both/helpers/fakeCallLink'; +} from '../../../test-helpers/fakeCallLink'; const OUR_ACI = generateAci(); const ACI_1 = generateAci(); diff --git a/ts/test-electron/state/selectors/conversations-extra_test.ts b/ts/test-electron/state/selectors/conversations-extra_test.ts index 0352836809..112370f53b 100644 --- a/ts/test-electron/state/selectors/conversations-extra_test.ts +++ b/ts/test-electron/state/selectors/conversations-extra_test.ts @@ -12,7 +12,7 @@ import type { ContactsByStory } from '../../../components/SafetyNumberChangeDial import * as Bytes from '../../../Bytes'; import { reducer as rootReducer } from '../../../state/reducer'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import { getEmptyState } from '../../../state/ducks/conversations'; import { getByDistributionListConversationsStoppingSend } from '../../../state/selectors/conversations-extra'; import { generateAci } from '../../../types/ServiceId'; diff --git a/ts/test-electron/state/selectors/messages_test.ts b/ts/test-electron/state/selectors/messages_test.ts index 21bd1d4bbf..97cb88ea41 100644 --- a/ts/test-electron/state/selectors/messages_test.ts +++ b/ts/test-electron/state/selectors/messages_test.ts @@ -13,7 +13,7 @@ import type { ConversationType } from '../../../state/ducks/conversations'; import { getDefaultConversation, getDefaultGroup, -} from '../../../test-both/helpers/getDefaultConversation'; +} from '../../../test-helpers/getDefaultConversation'; import { canDeleteForEveryone, diff --git a/ts/test-electron/util/downloadAttachment_test.ts b/ts/test-electron/util/downloadAttachment_test.ts index 802ce0a743..7da302aeb3 100644 --- a/ts/test-electron/util/downloadAttachment_test.ts +++ b/ts/test-electron/util/downloadAttachment_test.ts @@ -20,7 +20,7 @@ import { AttachmentVariant, AttachmentPermanentlyUndownloadableError, } from '../../types/Attachment'; -import { updateRemoteConfig } from '../../test-both/helpers/RemoteConfigStub'; +import { updateRemoteConfig } from '../../test-helpers/RemoteConfigStub'; import type { WebAPIType } from '../../textsecure/WebAPI'; import { toHex, toBase64 } from '../../Bytes'; import { generateAttachmentKeys } from '../../AttachmentCrypto'; diff --git a/ts/test-both/helpers/FakeLeftPaneContainer.tsx b/ts/test-helpers/FakeLeftPaneContainer.tsx similarity index 91% rename from ts/test-both/helpers/FakeLeftPaneContainer.tsx rename to ts/test-helpers/FakeLeftPaneContainer.tsx index 721bbbe911..787dfee8ab 100644 --- a/ts/test-both/helpers/FakeLeftPaneContainer.tsx +++ b/ts/test-helpers/FakeLeftPaneContainer.tsx @@ -2,7 +2,7 @@ // SPDX-License-Identifier: AGPL-3.0-only import React from 'react'; -import { WidthBreakpoint } from '../../components/_util'; +import { WidthBreakpoint } from '../components/_util'; type PropsType = { children?: React.ReactNode; diff --git a/ts/test-both/helpers/RemoteConfigStub.ts b/ts/test-helpers/RemoteConfigStub.ts similarity index 83% rename from ts/test-both/helpers/RemoteConfigStub.ts rename to ts/test-helpers/RemoteConfigStub.ts index 68db67f6a7..c2856dd323 100644 --- a/ts/test-both/helpers/RemoteConfigStub.ts +++ b/ts/test-helpers/RemoteConfigStub.ts @@ -1,11 +1,11 @@ // Copyright 2022 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import { _refreshRemoteConfig } from '../../RemoteConfig'; +import { _refreshRemoteConfig } from '../RemoteConfig'; import type { WebAPIType, RemoteConfigResponseType, -} from '../../textsecure/WebAPI'; +} from '../textsecure/WebAPI'; export async function updateRemoteConfig( newConfig: RemoteConfigResponseType['config'] diff --git a/ts/test-both/helpers/createCallParticipant.ts b/ts/test-helpers/createCallParticipant.ts similarity index 85% rename from ts/test-both/helpers/createCallParticipant.ts rename to ts/test-helpers/createCallParticipant.ts index 13a2841ee0..70a59814ab 100644 --- a/ts/test-both/helpers/createCallParticipant.ts +++ b/ts/test-helpers/createCallParticipant.ts @@ -3,9 +3,9 @@ import { sample } from 'lodash'; -import { AvatarColors } from '../../types/Colors'; -import type { GroupCallRemoteParticipantType } from '../../types/Calling'; -import { generateAci } from '../../types/ServiceId'; +import { AvatarColors } from '../types/Colors'; +import type { GroupCallRemoteParticipantType } from '../types/Calling'; +import { generateAci } from '../types/ServiceId'; import { getDefaultConversationWithServiceId } from './getDefaultConversation'; diff --git a/ts/test-both/helpers/defaultComposerStates.ts b/ts/test-helpers/defaultComposerStates.ts similarity index 83% rename from ts/test-both/helpers/defaultComposerStates.ts rename to ts/test-helpers/defaultComposerStates.ts index 2164406c73..9871ee4da4 100644 --- a/ts/test-both/helpers/defaultComposerStates.ts +++ b/ts/test-helpers/defaultComposerStates.ts @@ -1,9 +1,9 @@ // Copyright 2021 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import { ComposerStep } from '../../state/ducks/conversationsEnums'; -import { OneTimeModalState } from '../../groups/toggleSelectedContactForGroupAddition'; -import { DurationInSeconds } from '../../util/durations'; +import { ComposerStep } from '../state/ducks/conversationsEnums'; +import { OneTimeModalState } from '../groups/toggleSelectedContactForGroupAddition'; +import { DurationInSeconds } from '../util/durations'; export const defaultStartDirectConversationComposerState = { step: ComposerStep.StartDirectConversation as const, diff --git a/ts/test-both/util/expireTimers.ts b/ts/test-helpers/expireTimers.ts similarity index 84% rename from ts/test-both/util/expireTimers.ts rename to ts/test-helpers/expireTimers.ts index 593dfb12cc..b97953e2f9 100644 --- a/ts/test-both/util/expireTimers.ts +++ b/ts/test-helpers/expireTimers.ts @@ -1,8 +1,8 @@ // Copyright 2021 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import * as durations from '../../util/durations'; -import { DurationInSeconds } from '../../util/durations'; +import * as durations from '../util/durations'; +import { DurationInSeconds } from '../util/durations'; export type TestExpireTimer = Readonly<{ value: DurationInSeconds; diff --git a/ts/test-both/helpers/fakeAttachment.ts b/ts/test-helpers/fakeAttachment.ts similarity index 92% rename from ts/test-both/helpers/fakeAttachment.ts rename to ts/test-helpers/fakeAttachment.ts index 81ddac7f42..e17e7ba529 100644 --- a/ts/test-both/helpers/fakeAttachment.ts +++ b/ts/test-helpers/fakeAttachment.ts @@ -7,8 +7,8 @@ import type { AttachmentDraftType, ThumbnailType, AttachmentForUIType, -} from '../../types/Attachment'; -import { IMAGE_JPEG } from '../../types/MIME'; +} from '../types/Attachment'; +import { IMAGE_JPEG } from '../types/MIME'; export const fakeAttachment = ( overrides: Partial = {} diff --git a/ts/test-both/helpers/fakeCallLink.ts b/ts/test-helpers/fakeCallLink.ts similarity index 85% rename from ts/test-both/helpers/fakeCallLink.ts rename to ts/test-helpers/fakeCallLink.ts index 87ac3fa901..847ddb6b40 100644 --- a/ts/test-both/helpers/fakeCallLink.ts +++ b/ts/test-helpers/fakeCallLink.ts @@ -1,9 +1,9 @@ // Copyright 2024 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import type { CallLinkStateType, CallLinkType } from '../../types/CallLink'; -import type { CallingConversationType } from '../../types/Calling'; -import { CallLinkRestrictions } from '../../types/CallLink'; -import { MONTH } from '../../util/durations/constants'; +import type { CallLinkStateType, CallLinkType } from '../types/CallLink'; +import type { CallingConversationType } from '../types/Calling'; +import { CallLinkRestrictions } from '../types/CallLink'; +import { MONTH } from '../util/durations/constants'; export const FAKE_CALL_LINK: CallLinkType = { adminKey: null, diff --git a/ts/test-both/helpers/fakeGetGroupCallVideoFrameSource.ts b/ts/test-helpers/fakeGetGroupCallVideoFrameSource.ts similarity index 100% rename from ts/test-both/helpers/fakeGetGroupCallVideoFrameSource.ts rename to ts/test-helpers/fakeGetGroupCallVideoFrameSource.ts diff --git a/ts/test-both/helpers/fakeLookupConversationWithoutServiceId.ts b/ts/test-helpers/fakeLookupConversationWithoutServiceId.ts similarity index 88% rename from ts/test-both/helpers/fakeLookupConversationWithoutServiceId.ts rename to ts/test-helpers/fakeLookupConversationWithoutServiceId.ts index 95dea4228b..e7c4432fb4 100644 --- a/ts/test-both/helpers/fakeLookupConversationWithoutServiceId.ts +++ b/ts/test-helpers/fakeLookupConversationWithoutServiceId.ts @@ -6,11 +6,11 @@ import { useState } from 'react'; import type { UUIDFetchStateType, UUIDFetchStateKeyType, -} from '../../util/uuidFetchState'; -import type { lookupConversationWithoutServiceId } from '../../util/lookupConversationWithoutServiceId'; -import { sleep } from '../../util/sleep'; -import * as durations from '../../util/durations'; -import type { ConversationType } from '../../state/ducks/conversations'; +} from '../util/uuidFetchState'; +import type { lookupConversationWithoutServiceId } from '../util/lookupConversationWithoutServiceId'; +import { sleep } from '../util/sleep'; +import * as durations from '../util/durations'; +import type { ConversationType } from '../state/ducks/conversations'; import { getDefaultConversation } from './getDefaultConversation'; const VALID_IDENTIFIERS = new Set([ diff --git a/ts/test-both/helpers/generateBackup.ts b/ts/test-helpers/generateBackup.ts similarity index 91% rename from ts/test-both/helpers/generateBackup.ts rename to ts/test-helpers/generateBackup.ts index 3ae566872f..bb2beb7165 100644 --- a/ts/test-both/helpers/generateBackup.ts +++ b/ts/test-helpers/generateBackup.ts @@ -12,15 +12,15 @@ import { } from '@signalapp/libsignal-client/dist/AccountKeys'; import { MessageBackupKey } from '@signalapp/libsignal-client/dist/MessageBackup'; -import type { AciString } from '../../types/ServiceId'; -import { generateAci } from '../../types/ServiceId'; -import { CipherType } from '../../types/Crypto'; -import { appendPaddingStream } from '../../util/logPadding'; -import { prependStream } from '../../util/prependStream'; -import { appendMacStream } from '../../util/appendMacStream'; -import { toAciObject } from '../../util/ServiceId'; -import { BACKUP_VERSION } from '../../services/backups/constants'; -import { Backups } from '../../protobuf'; +import type { AciString } from '../types/ServiceId'; +import { generateAci } from '../types/ServiceId'; +import { CipherType } from '../types/Crypto'; +import { appendPaddingStream } from '../util/logPadding'; +import { prependStream } from '../util/prependStream'; +import { appendMacStream } from '../util/appendMacStream'; +import { toAciObject } from '../util/ServiceId'; +import { BACKUP_VERSION } from '../services/backups/constants'; +import { Backups } from '../protobuf'; export type BackupGeneratorConfigType = Readonly< { diff --git a/ts/test-both/helpers/getDefaultConversation.ts b/ts/test-helpers/getDefaultConversation.ts similarity index 85% rename from ts/test-both/helpers/getDefaultConversation.ts rename to ts/test-helpers/getDefaultConversation.ts index 2d3c1e74c5..ffd88dd9bd 100644 --- a/ts/test-both/helpers/getDefaultConversation.ts +++ b/ts/test-helpers/getDefaultConversation.ts @@ -5,14 +5,14 @@ import casual from 'casual'; import { sample } from 'lodash'; import { v4 as generateUuid } from 'uuid'; -import type { ConversationType } from '../../state/ducks/conversations'; -import type { ServiceIdString } from '../../types/ServiceId'; -import { generateAci } from '../../types/ServiceId'; -import type { GroupListItemConversationType } from '../../components/conversationList/GroupListItem'; +import type { ConversationType } from '../state/ducks/conversations'; +import type { ServiceIdString } from '../types/ServiceId'; +import { generateAci } from '../types/ServiceId'; +import type { GroupListItemConversationType } from '../components/conversationList/GroupListItem'; import { getRandomColor } from './getRandomColor'; -import { ConversationColors } from '../../types/Colors'; -import { StorySendMode } from '../../types/Stories'; -import { getAvatarPlaceholderGradient } from '../../utils/getAvatarPlaceholderGradient'; +import { ConversationColors } from '../types/Colors'; +import { StorySendMode } from '../types/Stories'; +import { getAvatarPlaceholderGradient } from '../utils/getAvatarPlaceholderGradient'; export const getAvatarPath = (): string => sample([ diff --git a/ts/test-both/helpers/getFakeBadge.ts b/ts/test-helpers/getFakeBadge.ts similarity index 82% rename from ts/test-both/helpers/getFakeBadge.ts rename to ts/test-helpers/getFakeBadge.ts index 7c5fa9a4a2..d5f48e4606 100644 --- a/ts/test-both/helpers/getFakeBadge.ts +++ b/ts/test-helpers/getFakeBadge.ts @@ -2,10 +2,10 @@ // SPDX-License-Identifier: AGPL-3.0-only import { times } from 'lodash'; -import type { BadgeType } from '../../badges/types'; -import { BadgeCategory } from '../../badges/BadgeCategory'; -import { BadgeImageTheme } from '../../badges/BadgeImageTheme'; -import { repeat, zipObject } from '../../util/iterables'; +import type { BadgeType } from '../badges/types'; +import { BadgeCategory } from '../badges/BadgeCategory'; +import { BadgeImageTheme } from '../badges/BadgeImageTheme'; +import { repeat, zipObject } from '../util/iterables'; export function getFakeBadge({ alternate = false, diff --git a/ts/test-both/helpers/getFakeCallHistoryGroup.ts b/ts/test-helpers/getFakeCallHistoryGroup.ts similarity index 86% rename from ts/test-both/helpers/getFakeCallHistoryGroup.ts rename to ts/test-helpers/getFakeCallHistoryGroup.ts index 28d20eb264..a356c22163 100644 --- a/ts/test-both/helpers/getFakeCallHistoryGroup.ts +++ b/ts/test-helpers/getFakeCallHistoryGroup.ts @@ -1,15 +1,15 @@ // Copyright 2024 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import type { CallHistoryGroup } from '../../types/CallDisposition'; +import type { CallHistoryGroup } from '../types/CallDisposition'; import { AdhocCallStatus, CallDirection, CallType, DirectCallStatus, CallMode, -} from '../../types/CallDisposition'; -import { DurationInSeconds } from '../../util/durations'; +} from '../types/CallDisposition'; +import { DurationInSeconds } from '../util/durations'; function mins(n: number) { return DurationInSeconds.toMillis(DurationInSeconds.fromMinutes(n)); diff --git a/ts/test-both/helpers/getFakeDistributionLists.ts b/ts/test-helpers/getFakeDistributionLists.ts similarity index 81% rename from ts/test-both/helpers/getFakeDistributionLists.ts rename to ts/test-helpers/getFakeDistributionLists.ts index 9f7fa468fe..8d64c1fca9 100644 --- a/ts/test-both/helpers/getFakeDistributionLists.ts +++ b/ts/test-helpers/getFakeDistributionLists.ts @@ -3,11 +3,11 @@ import casual from 'casual'; -import type { StoryDistributionListDataType } from '../../state/ducks/storyDistributionLists'; -import type { StoryDistributionListWithMembersDataType } from '../../types/Stories'; -import { MY_STORY_ID } from '../../types/Stories'; -import { generateStoryDistributionId } from '../../types/StoryDistributionId'; -import { generateAci } from '../../types/ServiceId'; +import type { StoryDistributionListDataType } from '../state/ducks/storyDistributionLists'; +import type { StoryDistributionListWithMembersDataType } from '../types/Stories'; +import { MY_STORY_ID } from '../types/Stories'; +import { generateStoryDistributionId } from '../types/StoryDistributionId'; +import { generateAci } from '../types/ServiceId'; import { getDefaultConversation } from './getDefaultConversation'; export function getFakeDistributionListsWithMembers(): Array { diff --git a/ts/test-both/helpers/getFakeStory.tsx b/ts/test-helpers/getFakeStory.tsx similarity index 87% rename from ts/test-both/helpers/getFakeStory.tsx rename to ts/test-helpers/getFakeStory.tsx index 08ff09acfd..a58a0c537b 100644 --- a/ts/test-both/helpers/getFakeStory.tsx +++ b/ts/test-helpers/getFakeStory.tsx @@ -4,17 +4,17 @@ import casual from 'casual'; import { v4 as generateUuid } from 'uuid'; -import type { AttachmentType } from '../../types/Attachment'; -import type { ConversationType } from '../../state/ducks/conversations'; +import type { AttachmentType } from '../types/Attachment'; +import type { ConversationType } from '../state/ducks/conversations'; import type { ConversationStoryType, MyStoryType, StoryViewType, -} from '../../types/Stories'; -import * as durations from '../../util/durations'; +} from '../types/Stories'; +import * as durations from '../util/durations'; import { getDefaultConversation } from './getDefaultConversation'; import { fakeAttachment, fakeThumbnail } from './fakeAttachment'; -import { MY_STORY_ID, ResolvedSendStatus } from '../../types/Stories'; +import { MY_STORY_ID, ResolvedSendStatus } from '../types/Stories'; function getAttachmentWithThumbnail(url: string): AttachmentType { return fakeAttachment({ diff --git a/ts/test-both/helpers/getRandomColor.ts b/ts/test-helpers/getRandomColor.ts similarity index 66% rename from ts/test-both/helpers/getRandomColor.ts rename to ts/test-helpers/getRandomColor.ts index d20f5b234b..eea99b2b37 100644 --- a/ts/test-both/helpers/getRandomColor.ts +++ b/ts/test-helpers/getRandomColor.ts @@ -2,8 +2,8 @@ // SPDX-License-Identifier: AGPL-3.0-only import { sample } from 'lodash'; -import type { AvatarColorType } from '../../types/Colors'; -import { AvatarColors } from '../../types/Colors'; +import type { AvatarColorType } from '../types/Colors'; +import { AvatarColors } from '../types/Colors'; export function getRandomColor(): AvatarColorType { return sample(AvatarColors) || AvatarColors[0]; diff --git a/ts/test-both/helpers/getStickerPacks.ts b/ts/test-helpers/getStickerPacks.ts similarity index 96% rename from ts/test-both/helpers/getStickerPacks.ts rename to ts/test-helpers/getStickerPacks.ts index 01bfa6302b..8753415e0d 100644 --- a/ts/test-both/helpers/getStickerPacks.ts +++ b/ts/test-helpers/getStickerPacks.ts @@ -1,7 +1,7 @@ // Copyright 2021 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import type { StickerPackType, StickerType } from '../../state/ducks/stickers'; +import type { StickerPackType, StickerType } from '../state/ducks/stickers'; export const createPack = ( props: Partial, diff --git a/ts/test-mock/backups/backups_test.ts b/ts/test-mock/backups/backups_test.ts index 7346c9b352..7dc756d61c 100644 --- a/ts/test-mock/backups/backups_test.ts +++ b/ts/test-mock/backups/backups_test.ts @@ -15,7 +15,7 @@ import Long from 'long'; import { generateStoryDistributionId } from '../../types/StoryDistributionId'; import { MY_STORY_ID } from '../../types/Stories'; import { generateAci } from '../../types/ServiceId'; -import { generateBackup } from '../../test-both/helpers/generateBackup'; +import { generateBackup } from '../../test-helpers/generateBackup'; import { IMAGE_JPEG } from '../../types/MIME'; import { uuidToBytes } from '../../util/uuidToBytes'; import * as durations from '../../util/durations'; diff --git a/ts/test-mock/benchmarks/backup_bench.ts b/ts/test-mock/benchmarks/backup_bench.ts index b481de721e..2a093f8a2f 100644 --- a/ts/test-mock/benchmarks/backup_bench.ts +++ b/ts/test-mock/benchmarks/backup_bench.ts @@ -3,7 +3,7 @@ import { Bootstrap, MAX_CYCLES } from './fixtures'; import { type RegressionSample } from '../bootstrap'; -import { generateBackup } from '../../test-both/helpers/generateBackup'; +import { generateBackup } from '../../test-helpers/generateBackup'; const INITIAL_MESSAGE_COUNT = 10000; const FINAL_MESSAGE_COUNT = 30000; diff --git a/ts/test-both/AsyncQueue_test.ts b/ts/test-node/AsyncQueue_test.ts similarity index 100% rename from ts/test-both/AsyncQueue_test.ts rename to ts/test-node/AsyncQueue_test.ts diff --git a/ts/test-both/RemoteConfig_test.ts b/ts/test-node/RemoteConfig_test.ts similarity index 100% rename from ts/test-both/RemoteConfig_test.ts rename to ts/test-node/RemoteConfig_test.ts diff --git a/ts/test-both/TaskWithTimeout_test.ts b/ts/test-node/TaskWithTimeout_test.ts similarity index 100% rename from ts/test-both/TaskWithTimeout_test.ts rename to ts/test-node/TaskWithTimeout_test.ts diff --git a/ts/test-both/badges/getBadgeImageFileLocalPath_test.ts b/ts/test-node/badges/getBadgeImageFileLocalPath_test.ts similarity index 100% rename from ts/test-both/badges/getBadgeImageFileLocalPath_test.ts rename to ts/test-node/badges/getBadgeImageFileLocalPath_test.ts diff --git a/ts/test-both/badges/isBadgeImageFileUrlValid_test.ts b/ts/test-node/badges/isBadgeImageFileUrlValid_test.ts similarity index 100% rename from ts/test-both/badges/isBadgeImageFileUrlValid_test.ts rename to ts/test-node/badges/isBadgeImageFileUrlValid_test.ts diff --git a/ts/test-both/badges/isBadgeVisible_test.ts b/ts/test-node/badges/isBadgeVisible_test.ts similarity index 100% rename from ts/test-both/badges/isBadgeVisible_test.ts rename to ts/test-node/badges/isBadgeVisible_test.ts diff --git a/ts/test-both/badges/parseBadgesFromServer_test.ts b/ts/test-node/badges/parseBadgesFromServer_test.ts similarity index 100% rename from ts/test-both/badges/parseBadgesFromServer_test.ts rename to ts/test-node/badges/parseBadgesFromServer_test.ts diff --git a/ts/test-both/calling/findBestMatchingDevice_test.ts b/ts/test-node/calling/findBestMatchingDevice_test.ts similarity index 100% rename from ts/test-both/calling/findBestMatchingDevice_test.ts rename to ts/test-node/calling/findBestMatchingDevice_test.ts diff --git a/ts/test-both/challenge_test.ts b/ts/test-node/challenge_test.ts similarity index 100% rename from ts/test-both/challenge_test.ts rename to ts/test-node/challenge_test.ts diff --git a/ts/test-node/components/leftPane/LeftPaneArchiveHelper_test.ts b/ts/test-node/components/leftPane/LeftPaneArchiveHelper_test.ts index d7dbd5f29a..dbcde58a25 100644 --- a/ts/test-node/components/leftPane/LeftPaneArchiveHelper_test.ts +++ b/ts/test-node/components/leftPane/LeftPaneArchiveHelper_test.ts @@ -6,7 +6,7 @@ import * as sinon from 'sinon'; import { v4 as uuid } from 'uuid'; import { RowType } from '../../../components/ConversationList'; import { FindDirection } from '../../../components/leftPane/LeftPaneHelper'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import { LeftPaneSearchHelper } from '../../../components/leftPane/LeftPaneSearchHelper'; import { LeftPaneArchiveHelper } from '../../../components/leftPane/LeftPaneArchiveHelper'; diff --git a/ts/test-node/components/leftPane/LeftPaneChooseGroupMembersHelper_test.ts b/ts/test-node/components/leftPane/LeftPaneChooseGroupMembersHelper_test.ts index 4b0ac0c44e..7c8bf9429b 100644 --- a/ts/test-node/components/leftPane/LeftPaneChooseGroupMembersHelper_test.ts +++ b/ts/test-node/components/leftPane/LeftPaneChooseGroupMembersHelper_test.ts @@ -6,7 +6,7 @@ import * as sinon from 'sinon'; import { times } from 'lodash'; import { RowType, _testHeaderText } from '../../../components/ConversationList'; import { ContactCheckboxDisabledReason } from '../../../components/conversationList/ContactCheckbox'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import { LeftPaneChooseGroupMembersHelper } from '../../../components/leftPane/LeftPaneChooseGroupMembersHelper'; diff --git a/ts/test-node/components/leftPane/LeftPaneComposeHelper_test.ts b/ts/test-node/components/leftPane/LeftPaneComposeHelper_test.ts index 1d49e2c926..32992d1f92 100644 --- a/ts/test-node/components/leftPane/LeftPaneComposeHelper_test.ts +++ b/ts/test-node/components/leftPane/LeftPaneComposeHelper_test.ts @@ -8,7 +8,7 @@ import { FindDirection } from '../../../components/leftPane/LeftPaneHelper'; import { getDefaultConversation, getDefaultGroupListItem, -} from '../../../test-both/helpers/getDefaultConversation'; +} from '../../../test-helpers/getDefaultConversation'; import { LeftPaneComposeHelper } from '../../../components/leftPane/LeftPaneComposeHelper'; diff --git a/ts/test-node/components/leftPane/LeftPaneInboxHelper_test.tsx b/ts/test-node/components/leftPane/LeftPaneInboxHelper_test.tsx index e24e15e6e6..a98a126201 100644 --- a/ts/test-node/components/leftPane/LeftPaneInboxHelper_test.tsx +++ b/ts/test-node/components/leftPane/LeftPaneInboxHelper_test.tsx @@ -5,7 +5,7 @@ import { assert } from 'chai'; import * as sinon from 'sinon'; import { RowType, _testHeaderText } from '../../../components/ConversationList'; import { FindDirection } from '../../../components/leftPane/LeftPaneHelper'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import type { LeftPaneInboxPropsType } from '../../../components/leftPane/LeftPaneInboxHelper'; import { LeftPaneInboxHelper } from '../../../components/leftPane/LeftPaneInboxHelper'; diff --git a/ts/test-node/components/leftPane/LeftPaneSearchHelper_test.ts b/ts/test-node/components/leftPane/LeftPaneSearchHelper_test.ts index 03976e6343..d2eb881de1 100644 --- a/ts/test-node/components/leftPane/LeftPaneSearchHelper_test.ts +++ b/ts/test-node/components/leftPane/LeftPaneSearchHelper_test.ts @@ -5,7 +5,7 @@ import { assert } from 'chai'; import * as sinon from 'sinon'; import { v4 as uuid } from 'uuid'; import { RowType, _testHeaderText } from '../../../components/ConversationList'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import { LeftPaneSearchHelper } from '../../../components/leftPane/LeftPaneSearchHelper'; diff --git a/ts/test-node/components/leftPane/LeftPaneSetGroupMetadataHelper_test.ts b/ts/test-node/components/leftPane/LeftPaneSetGroupMetadataHelper_test.ts index 5be0a0d62f..345d993af7 100644 --- a/ts/test-node/components/leftPane/LeftPaneSetGroupMetadataHelper_test.ts +++ b/ts/test-node/components/leftPane/LeftPaneSetGroupMetadataHelper_test.ts @@ -4,7 +4,7 @@ import { assert } from 'chai'; import * as sinon from 'sinon'; import { RowType, _testHeaderText } from '../../../components/ConversationList'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import { DurationInSeconds } from '../../../util/durations'; import { LeftPaneSetGroupMetadataHelper } from '../../../components/leftPane/LeftPaneSetGroupMetadataHelper'; diff --git a/ts/test-node/components/leftPane/getConversationInDirection_test.ts b/ts/test-node/components/leftPane/getConversationInDirection_test.ts index 27512f0cfa..61974d992e 100644 --- a/ts/test-node/components/leftPane/getConversationInDirection_test.ts +++ b/ts/test-node/components/leftPane/getConversationInDirection_test.ts @@ -4,7 +4,7 @@ import { assert } from 'chai'; import type { ToFindType } from '../../../components/leftPane/LeftPaneHelper'; import { FindDirection } from '../../../components/leftPane/LeftPaneHelper'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; import { getConversationInDirection } from '../../../components/leftPane/getConversationInDirection'; diff --git a/ts/test-node/components/media-gallery/groupMediaItemsByDate.ts b/ts/test-node/components/media-gallery/groupMediaItemsByDate.ts index 0ada15e6f7..6bf70bc2ed 100644 --- a/ts/test-node/components/media-gallery/groupMediaItemsByDate.ts +++ b/ts/test-node/components/media-gallery/groupMediaItemsByDate.ts @@ -7,7 +7,7 @@ import { shuffle } from 'lodash'; import { IMAGE_JPEG } from '../../../types/MIME'; import { groupMediaItemsByDate } from '../../../components/conversation/media-gallery/groupMediaItemsByDate'; import type { MediaItemType } from '../../../types/MediaItem'; -import { fakeAttachment } from '../../../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../../../test-helpers/fakeAttachment'; const testDate = ( year: number, diff --git a/ts/test-both/conversations/isConversationTooBigToRing_test.ts b/ts/test-node/conversations/isConversationTooBigToRing_test.ts similarity index 96% rename from ts/test-both/conversations/isConversationTooBigToRing_test.ts rename to ts/test-node/conversations/isConversationTooBigToRing_test.ts index ffa3f5124a..fe33764912 100644 --- a/ts/test-both/conversations/isConversationTooBigToRing_test.ts +++ b/ts/test-node/conversations/isConversationTooBigToRing_test.ts @@ -3,7 +3,7 @@ import { assert } from 'chai'; import { times } from 'lodash'; -import { updateRemoteConfig } from '../helpers/RemoteConfigStub'; +import { updateRemoteConfig } from '../../test-helpers/RemoteConfigStub'; import { generateAci } from '../../types/ServiceId'; import { isConversationTooBigToRing } from '../../conversations/isConversationTooBigToRing'; diff --git a/ts/test-both/environment_test.ts b/ts/test-node/environment_test.ts similarity index 100% rename from ts/test-both/environment_test.ts rename to ts/test-node/environment_test.ts diff --git a/ts/test-both/groups/add_banned_member_test.ts b/ts/test-node/groups/add_banned_member_test.ts similarity index 97% rename from ts/test-both/groups/add_banned_member_test.ts rename to ts/test-node/groups/add_banned_member_test.ts index 0aac1d3610..9a7206c89f 100644 --- a/ts/test-both/groups/add_banned_member_test.ts +++ b/ts/test-node/groups/add_banned_member_test.ts @@ -6,7 +6,7 @@ import { assert } from 'chai'; import { generateAci } from '../../types/ServiceId'; import { _maybeBuildAddBannedMemberActions } from '../../groups'; import { getClientZkGroupCipher, decryptServiceId } from '../../util/zkgroup'; -import { updateRemoteConfig } from '../helpers/RemoteConfigStub'; +import { updateRemoteConfig } from '../../test-helpers/RemoteConfigStub'; const HARD_LIMIT_KEY = 'global.groupsv2.groupSizeHardLimit'; diff --git a/ts/test-both/groups/limits_test.ts b/ts/test-node/groups/limits_test.ts similarity index 96% rename from ts/test-both/groups/limits_test.ts rename to ts/test-node/groups/limits_test.ts index 5e91fd8209..c1be17cbf1 100644 --- a/ts/test-both/groups/limits_test.ts +++ b/ts/test-node/groups/limits_test.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: AGPL-3.0-only import { assert } from 'chai'; -import { updateRemoteConfig } from '../helpers/RemoteConfigStub'; +import { updateRemoteConfig } from '../../test-helpers/RemoteConfigStub'; import { getGroupSizeRecommendedLimit, diff --git a/ts/test-both/groups/message_merge_test.ts b/ts/test-node/groups/message_merge_test.ts similarity index 100% rename from ts/test-both/groups/message_merge_test.ts rename to ts/test-node/groups/message_merge_test.ts diff --git a/ts/test-node/jobs/helpers/addReportSpamJob_test.ts b/ts/test-node/jobs/helpers/addReportSpamJob_test.ts index 1937dc1ff7..4c675ff5de 100644 --- a/ts/test-node/jobs/helpers/addReportSpamJob_test.ts +++ b/ts/test-node/jobs/helpers/addReportSpamJob_test.ts @@ -4,7 +4,7 @@ import * as sinon from 'sinon'; import { Job } from '../../../jobs/Job'; import { addReportSpamJob } from '../../../jobs/helpers/addReportSpamJob'; import type { ConversationType } from '../../../state/ducks/conversations'; -import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../../test-helpers/getDefaultConversation'; describe('addReportSpamJob', () => { let getMessageServerGuidsForSpam: sinon.SinonStub; diff --git a/ts/test-both/linkPreviews/shouldUseFullSizeLinkPreviewImage_test.ts b/ts/test-node/linkPreviews/shouldUseFullSizeLinkPreviewImage_test.ts similarity index 98% rename from ts/test-both/linkPreviews/shouldUseFullSizeLinkPreviewImage_test.ts rename to ts/test-node/linkPreviews/shouldUseFullSizeLinkPreviewImage_test.ts index 5073c0ccd5..402df7eebf 100644 --- a/ts/test-both/linkPreviews/shouldUseFullSizeLinkPreviewImage_test.ts +++ b/ts/test-node/linkPreviews/shouldUseFullSizeLinkPreviewImage_test.ts @@ -4,7 +4,7 @@ import { assert } from 'chai'; import { VIDEO_MP4 } from '../../types/MIME'; -import { fakeAttachment } from '../helpers/fakeAttachment'; +import { fakeAttachment } from '../../test-helpers/fakeAttachment'; import { shouldUseFullSizeLinkPreviewImage } from '../../linkPreviews/shouldUseFullSizeLinkPreviewImage'; diff --git a/ts/test-both/logging/formatCountForLogging_test.ts b/ts/test-node/logging/formatCountForLogging_test.ts similarity index 100% rename from ts/test-both/logging/formatCountForLogging_test.ts rename to ts/test-node/logging/formatCountForLogging_test.ts diff --git a/ts/test-both/messages/MessageReadStatus_test.ts b/ts/test-node/messages/MessageReadStatus_test.ts similarity index 100% rename from ts/test-both/messages/MessageReadStatus_test.ts rename to ts/test-node/messages/MessageReadStatus_test.ts diff --git a/ts/test-both/messages/MessageSendState_test.ts b/ts/test-node/messages/MessageSendState_test.ts similarity index 100% rename from ts/test-both/messages/MessageSendState_test.ts rename to ts/test-node/messages/MessageSendState_test.ts diff --git a/ts/test-both/messages/migrateLegacyReadStatus_test.ts b/ts/test-node/messages/migrateLegacyReadStatus_test.ts similarity index 100% rename from ts/test-both/messages/migrateLegacyReadStatus_test.ts rename to ts/test-node/messages/migrateLegacyReadStatus_test.ts diff --git a/ts/test-both/messages/migrateLegacySendAttributes_test.ts b/ts/test-node/messages/migrateLegacySendAttributes_test.ts similarity index 98% rename from ts/test-both/messages/migrateLegacySendAttributes_test.ts rename to ts/test-node/messages/migrateLegacySendAttributes_test.ts index c822e8563c..a07b1d2d01 100644 --- a/ts/test-both/messages/migrateLegacySendAttributes_test.ts +++ b/ts/test-node/messages/migrateLegacySendAttributes_test.ts @@ -3,7 +3,7 @@ import { assert } from 'chai'; import { v4 as uuid } from 'uuid'; -import { getDefaultConversation } from '../helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import type { ConversationType } from '../../state/ducks/conversations'; import { SendStatus } from '../../messages/MessageSendState'; diff --git a/ts/test-both/processDataMessage_test.ts b/ts/test-node/processDataMessage_test.ts similarity index 100% rename from ts/test-both/processDataMessage_test.ts rename to ts/test-node/processDataMessage_test.ts diff --git a/ts/test-both/processSyncMessage_test.ts b/ts/test-node/processSyncMessage_test.ts similarity index 100% rename from ts/test-both/processSyncMessage_test.ts rename to ts/test-node/processSyncMessage_test.ts diff --git a/ts/test-both/reactions/isValidReactionEmoji_test.ts b/ts/test-node/reactions/isValidReactionEmoji_test.ts similarity index 100% rename from ts/test-both/reactions/isValidReactionEmoji_test.ts rename to ts/test-node/reactions/isValidReactionEmoji_test.ts diff --git a/ts/test-both/reactions/preferredReactionEmoji_test.ts b/ts/test-node/reactions/preferredReactionEmoji_test.ts similarity index 100% rename from ts/test-both/reactions/preferredReactionEmoji_test.ts rename to ts/test-node/reactions/preferredReactionEmoji_test.ts diff --git a/ts/test-both/reactions/util_test.ts b/ts/test-node/reactions/util_test.ts similarity index 100% rename from ts/test-both/reactions/util_test.ts rename to ts/test-node/reactions/util_test.ts diff --git a/ts/test-both/services/ourProfileKey_test.ts b/ts/test-node/services/ourProfileKey_test.ts similarity index 100% rename from ts/test-both/services/ourProfileKey_test.ts rename to ts/test-node/services/ourProfileKey_test.ts diff --git a/ts/test-both/sql/cleanDataForIpc_test.ts b/ts/test-node/sql/cleanDataForIpc_test.ts similarity index 100% rename from ts/test-both/sql/cleanDataForIpc_test.ts rename to ts/test-node/sql/cleanDataForIpc_test.ts diff --git a/ts/test-both/sql/cleanMessageData_test.ts b/ts/test-node/sql/cleanMessageData_test.ts similarity index 100% rename from ts/test-both/sql/cleanMessageData_test.ts rename to ts/test-node/sql/cleanMessageData_test.ts diff --git a/ts/test-node/sql/migration_1220_test.ts b/ts/test-node/sql/migration_1220_test.ts index e002892816..659564b3d5 100644 --- a/ts/test-node/sql/migration_1220_test.ts +++ b/ts/test-node/sql/migration_1220_test.ts @@ -9,7 +9,7 @@ import { sessionStructureToBytes, } from '../../util/sessionTranslation'; import { createDB, updateToVersion, insertData, getTableData } from './helpers'; -import { SESSION_V1_RECORD } from '../../test-both/util/sessionTranslation_test'; +import { SESSION_V1_RECORD } from '../util/sessionTranslation_test'; const MAPS = [ { diff --git a/ts/test-both/state/ducks/audioPlayer_test.ts b/ts/test-node/state/ducks/audioPlayer_test.ts similarity index 100% rename from ts/test-both/state/ducks/audioPlayer_test.ts rename to ts/test-node/state/ducks/audioPlayer_test.ts diff --git a/ts/test-both/state/ducks/badges_test.ts b/ts/test-node/state/ducks/badges_test.ts similarity index 98% rename from ts/test-both/state/ducks/badges_test.ts rename to ts/test-node/state/ducks/badges_test.ts index c0c6c8d140..d531d1bc4c 100644 --- a/ts/test-both/state/ducks/badges_test.ts +++ b/ts/test-node/state/ducks/badges_test.ts @@ -3,7 +3,7 @@ import { assert } from 'chai'; -import { getFakeBadge } from '../../helpers/getFakeBadge'; +import { getFakeBadge } from '../../../test-helpers/getFakeBadge'; import { repeat, zipObject } from '../../../util/iterables'; import { BadgeImageTheme } from '../../../badges/BadgeImageTheme'; diff --git a/ts/test-both/state/ducks/composer_test.ts b/ts/test-node/state/ducks/composer_test.ts similarity index 98% rename from ts/test-both/state/ducks/composer_test.ts rename to ts/test-node/state/ducks/composer_test.ts index 1712f9778b..89d383f605 100644 --- a/ts/test-both/state/ducks/composer_test.ts +++ b/ts/test-node/state/ducks/composer_test.ts @@ -18,7 +18,7 @@ import { reducer as rootReducer } from '../../../state/reducer'; import { IMAGE_JPEG } from '../../../types/MIME'; import type { AttachmentDraftType } from '../../../types/Attachment'; -import { fakeDraftAttachment } from '../../helpers/fakeAttachment'; +import { fakeDraftAttachment } from '../../../test-helpers/fakeAttachment'; describe('both/state/ducks/composer', () => { const QUOTED_MESSAGE = { diff --git a/ts/test-both/state/ducks/globalModals_test.ts b/ts/test-node/state/ducks/globalModals_test.ts similarity index 100% rename from ts/test-both/state/ducks/globalModals_test.ts rename to ts/test-node/state/ducks/globalModals_test.ts diff --git a/ts/test-both/state/ducks/linkPreviews_test.ts b/ts/test-node/state/ducks/linkPreviews_test.ts similarity index 100% rename from ts/test-both/state/ducks/linkPreviews_test.ts rename to ts/test-node/state/ducks/linkPreviews_test.ts diff --git a/ts/test-both/state/ducks/network_test.ts b/ts/test-node/state/ducks/network_test.ts similarity index 100% rename from ts/test-both/state/ducks/network_test.ts rename to ts/test-node/state/ducks/network_test.ts diff --git a/ts/test-both/state/ducks/preferredReactions_test.ts b/ts/test-node/state/ducks/preferredReactions_test.ts similarity index 100% rename from ts/test-both/state/ducks/preferredReactions_test.ts rename to ts/test-node/state/ducks/preferredReactions_test.ts diff --git a/ts/test-both/state/selectors/conversations_test.ts b/ts/test-node/state/selectors/conversations_test.ts similarity index 99% rename from ts/test-both/state/selectors/conversations_test.ts rename to ts/test-node/state/selectors/conversations_test.ts index 039b879aec..e31bb3765f 100644 --- a/ts/test-both/state/selectors/conversations_test.ts +++ b/ts/test-node/state/selectors/conversations_test.ts @@ -54,12 +54,12 @@ import { getDefaultConversation, getDefaultGroup, getDefaultConversationWithServiceId, -} from '../../helpers/getDefaultConversation'; +} from '../../../test-helpers/getDefaultConversation'; import { defaultStartDirectConversationComposerState, defaultChooseGroupMembersComposerState, defaultSetGroupMetadataComposerState, -} from '../../helpers/defaultComposerStates'; +} from '../../../test-helpers/defaultComposerStates'; describe('both/state/selectors/conversations-extra', () => { const SERVICE_ID_1 = generateAci(); diff --git a/ts/test-both/state/selectors/items_test.ts b/ts/test-node/state/selectors/items_test.ts similarity index 100% rename from ts/test-both/state/selectors/items_test.ts rename to ts/test-node/state/selectors/items_test.ts diff --git a/ts/test-both/state/selectors/preferredReactions_test.ts b/ts/test-node/state/selectors/preferredReactions_test.ts similarity index 100% rename from ts/test-both/state/selectors/preferredReactions_test.ts rename to ts/test-node/state/selectors/preferredReactions_test.ts diff --git a/ts/test-both/state/selectors/search_test.ts b/ts/test-node/state/selectors/search_test.ts similarity index 99% rename from ts/test-both/state/selectors/search_test.ts rename to ts/test-node/state/selectors/search_test.ts index 1f3504276d..12d99a81c7 100644 --- a/ts/test-both/state/selectors/search_test.ts +++ b/ts/test-node/state/selectors/search_test.ts @@ -25,7 +25,7 @@ import { generateAci } from '../../../types/ServiceId'; import { getDefaultConversation, getDefaultConversationWithServiceId, -} from '../../helpers/getDefaultConversation'; +} from '../../../test-helpers/getDefaultConversation'; import { ReadStatus } from '../../../messages/MessageReadStatus'; import type { StateType } from '../../../state/reducer'; diff --git a/ts/test-both/state/selectors/user_test.ts b/ts/test-node/state/selectors/user_test.ts similarity index 100% rename from ts/test-both/state/selectors/user_test.ts rename to ts/test-node/state/selectors/user_test.ts diff --git a/ts/test-node/types/Attachment_test.ts b/ts/test-node/types/Attachment_test.ts index b2e500ca65..75a1487427 100644 --- a/ts/test-node/types/Attachment_test.ts +++ b/ts/test-node/types/Attachment_test.ts @@ -9,7 +9,7 @@ import { SignalService } from '../../protobuf'; import * as Bytes from '../../Bytes'; import { createLogger } from '../../logging/log'; -import { fakeAttachment } from '../../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../../test-helpers/fakeAttachment'; import { DAY } from '../../util/durations'; import { migrateDataToFileSystem } from '../../util/attachments/migrateDataToFilesystem'; diff --git a/ts/test-both/types/Avatar_test.ts b/ts/test-node/types/Avatar_test.ts similarity index 100% rename from ts/test-both/types/Avatar_test.ts rename to ts/test-node/types/Avatar_test.ts diff --git a/ts/test-both/types/BodyRange_test.ts b/ts/test-node/types/BodyRange_test.ts similarity index 100% rename from ts/test-both/types/BodyRange_test.ts rename to ts/test-node/types/BodyRange_test.ts diff --git a/ts/test-node/types/EmbeddedContact_test.ts b/ts/test-node/types/EmbeddedContact_test.ts index 4447812bae..8c289b3aaa 100644 --- a/ts/test-node/types/EmbeddedContact_test.ts +++ b/ts/test-node/types/EmbeddedContact_test.ts @@ -16,7 +16,7 @@ import { parseAndWriteAvatar, parsePhoneItem, } from '../../types/EmbeddedContact'; -import { fakeAttachment } from '../../test-both/helpers/fakeAttachment'; +import { fakeAttachment } from '../../test-helpers/fakeAttachment'; import { generateAci } from '../../types/ServiceId'; const logger = createLogger('EmbeddedContact_test'); diff --git a/ts/test-both/types/PhoneNumber_test.ts b/ts/test-node/types/PhoneNumber_test.ts similarity index 100% rename from ts/test-both/types/PhoneNumber_test.ts rename to ts/test-node/types/PhoneNumber_test.ts diff --git a/ts/test-both/types/SchemaVersion_test.ts b/ts/test-node/types/SchemaVersion_test.ts similarity index 100% rename from ts/test-both/types/SchemaVersion_test.ts rename to ts/test-node/types/SchemaVersion_test.ts diff --git a/ts/test-both/types/Stickers_test.ts b/ts/test-node/types/Stickers_test.ts similarity index 100% rename from ts/test-both/types/Stickers_test.ts rename to ts/test-node/types/Stickers_test.ts diff --git a/ts/test-both/types/StoryDistributionId_test.ts b/ts/test-node/types/StoryDistributionId_test.ts similarity index 100% rename from ts/test-both/types/StoryDistributionId_test.ts rename to ts/test-node/types/StoryDistributionId_test.ts diff --git a/ts/test-both/types/errors_test.ts b/ts/test-node/types/errors_test.ts similarity index 100% rename from ts/test-both/types/errors_test.ts rename to ts/test-node/types/errors_test.ts diff --git a/ts/test-both/types/setupI18n_test.ts b/ts/test-node/types/setupI18n_test.ts similarity index 100% rename from ts/test-both/types/setupI18n_test.ts rename to ts/test-node/types/setupI18n_test.ts diff --git a/ts/test-both/util/AbortableProcess_test.ts b/ts/test-node/util/AbortableProcess_test.ts similarity index 100% rename from ts/test-both/util/AbortableProcess_test.ts rename to ts/test-node/util/AbortableProcess_test.ts diff --git a/ts/test-both/util/BackOff_test.ts b/ts/test-node/util/BackOff_test.ts similarity index 100% rename from ts/test-both/util/BackOff_test.ts rename to ts/test-node/util/BackOff_test.ts diff --git a/ts/test-both/util/Bytes_test.ts b/ts/test-node/util/Bytes_test.ts similarity index 100% rename from ts/test-both/util/Bytes_test.ts rename to ts/test-node/util/Bytes_test.ts diff --git a/ts/test-both/util/appendMacStream_test.ts b/ts/test-node/util/appendMacStream_test.ts similarity index 100% rename from ts/test-both/util/appendMacStream_test.ts rename to ts/test-node/util/appendMacStream_test.ts diff --git a/ts/test-both/util/areObjectEntriesEqual_test.ts b/ts/test-node/util/areObjectEntriesEqual_test.ts similarity index 100% rename from ts/test-both/util/areObjectEntriesEqual_test.ts rename to ts/test-node/util/areObjectEntriesEqual_test.ts diff --git a/ts/test-both/util/arePinnedConversationsEqual_test.ts b/ts/test-node/util/arePinnedConversationsEqual_test.ts similarity index 100% rename from ts/test-both/util/arePinnedConversationsEqual_test.ts rename to ts/test-node/util/arePinnedConversationsEqual_test.ts diff --git a/ts/test-both/util/assert_test.ts b/ts/test-node/util/assert_test.ts similarity index 100% rename from ts/test-both/util/assert_test.ts rename to ts/test-node/util/assert_test.ts diff --git a/ts/test-both/util/assignWithNoUnnecessaryAllocation_test.ts b/ts/test-node/util/assignWithNoUnnecessaryAllocation_test.ts similarity index 100% rename from ts/test-both/util/assignWithNoUnnecessaryAllocation_test.ts rename to ts/test-node/util/assignWithNoUnnecessaryAllocation_test.ts diff --git a/ts/test-both/util/asyncIterables_test.ts b/ts/test-node/util/asyncIterables_test.ts similarity index 100% rename from ts/test-both/util/asyncIterables_test.ts rename to ts/test-node/util/asyncIterables_test.ts diff --git a/ts/test-both/util/awaitObject_test.ts b/ts/test-node/util/awaitObject_test.ts similarity index 100% rename from ts/test-both/util/awaitObject_test.ts rename to ts/test-node/util/awaitObject_test.ts diff --git a/ts/test-both/util/batcher_test.ts b/ts/test-node/util/batcher_test.ts similarity index 100% rename from ts/test-both/util/batcher_test.ts rename to ts/test-node/util/batcher_test.ts diff --git a/ts/test-both/util/blockSendUntilConversationsAreVerified_test.ts b/ts/test-node/util/blockSendUntilConversationsAreVerified_test.ts similarity index 100% rename from ts/test-both/util/blockSendUntilConversationsAreVerified_test.ts rename to ts/test-node/util/blockSendUntilConversationsAreVerified_test.ts diff --git a/ts/test-node/util/callDisposition_test.ts b/ts/test-node/util/callDisposition_test.ts index 69769f9586..88573d7d04 100644 --- a/ts/test-node/util/callDisposition_test.ts +++ b/ts/test-node/util/callDisposition_test.ts @@ -12,7 +12,7 @@ import { import { getDefaultConversation, getDefaultGroup, -} from '../../test-both/helpers/getDefaultConversation'; +} from '../../test-helpers/getDefaultConversation'; import { uuidToBytes } from '../../util/uuidToBytes'; const MOCK_ERA = 'abc'; diff --git a/ts/test-both/util/callLinks_test.ts b/ts/test-node/util/callLinks_test.ts similarity index 94% rename from ts/test-both/util/callLinks_test.ts rename to ts/test-node/util/callLinks_test.ts index f43885bb50..70d525c3bb 100644 --- a/ts/test-both/util/callLinks_test.ts +++ b/ts/test-node/util/callLinks_test.ts @@ -10,7 +10,7 @@ import { import { FAKE_CALL_LINK as CALL_LINK, FAKE_CALL_LINK_WITH_ADMIN_KEY as CALL_LINK_WITH_ADMIN_KEY, -} from '../helpers/fakeCallLink'; +} from '../../test-helpers/fakeCallLink'; describe('callLinks', () => { it('callLinkToRecord() and callLinkFromRecord() can convert to record and back', () => { diff --git a/ts/test-both/util/callingGetParticipantName_test.ts b/ts/test-node/util/callingGetParticipantName_test.ts similarity index 100% rename from ts/test-both/util/callingGetParticipantName_test.ts rename to ts/test-node/util/callingGetParticipantName_test.ts diff --git a/ts/test-both/util/callingNotification_test.ts b/ts/test-node/util/callingNotification_test.ts similarity index 99% rename from ts/test-both/util/callingNotification_test.ts rename to ts/test-node/util/callingNotification_test.ts index 327ec57f24..879fc8ef27 100644 --- a/ts/test-both/util/callingNotification_test.ts +++ b/ts/test-node/util/callingNotification_test.ts @@ -14,7 +14,7 @@ import enMessages from '../../../_locales/en/messages.json'; import { getDefaultConversation, getDefaultGroup, -} from '../helpers/getDefaultConversation'; +} from '../../test-helpers/getDefaultConversation'; import { getPeerIdFromConversation } from '../../util/callDisposition'; import { HOUR } from '../../util/durations'; diff --git a/ts/test-both/util/characters_test.ts b/ts/test-node/util/characters_test.ts similarity index 100% rename from ts/test-both/util/characters_test.ts rename to ts/test-node/util/characters_test.ts diff --git a/ts/test-both/util/clearTimeoutIfNecessary_test.ts b/ts/test-node/util/clearTimeoutIfNecessary_test.ts similarity index 100% rename from ts/test-both/util/clearTimeoutIfNecessary_test.ts rename to ts/test-node/util/clearTimeoutIfNecessary_test.ts diff --git a/ts/test-both/util/countUnreadStats_test.ts b/ts/test-node/util/countUnreadStats_test.ts similarity index 100% rename from ts/test-both/util/countUnreadStats_test.ts rename to ts/test-node/util/countUnreadStats_test.ts diff --git a/ts/test-both/util/deconstructLookup_test.ts b/ts/test-node/util/deconstructLookup_test.ts similarity index 100% rename from ts/test-both/util/deconstructLookup_test.ts rename to ts/test-node/util/deconstructLookup_test.ts diff --git a/ts/test-both/util/diffArraysAsSets_test.ts b/ts/test-node/util/diffArraysAsSets_test.ts similarity index 100% rename from ts/test-both/util/diffArraysAsSets_test.ts rename to ts/test-node/util/diffArraysAsSets_test.ts diff --git a/ts/test-both/util/dropNull_test.ts b/ts/test-node/util/dropNull_test.ts similarity index 100% rename from ts/test-both/util/dropNull_test.ts rename to ts/test-node/util/dropNull_test.ts diff --git a/ts/test-both/util/emoji_test.ts b/ts/test-node/util/emoji_test.ts similarity index 100% rename from ts/test-both/util/emoji_test.ts rename to ts/test-node/util/emoji_test.ts diff --git a/ts/test-both/util/enum_test.ts b/ts/test-node/util/enum_test.ts similarity index 100% rename from ts/test-both/util/enum_test.ts rename to ts/test-node/util/enum_test.ts diff --git a/ts/test-both/util/expirationTimer_test.ts b/ts/test-node/util/expirationTimer_test.ts similarity index 100% rename from ts/test-both/util/expirationTimer_test.ts rename to ts/test-node/util/expirationTimer_test.ts diff --git a/ts/test-both/util/explodePromise_test.ts b/ts/test-node/util/explodePromise_test.ts similarity index 100% rename from ts/test-both/util/explodePromise_test.ts rename to ts/test-node/util/explodePromise_test.ts diff --git a/ts/test-both/util/exponentialBackoff_test.ts b/ts/test-node/util/exponentialBackoff_test.ts similarity index 100% rename from ts/test-both/util/exponentialBackoff_test.ts rename to ts/test-node/util/exponentialBackoff_test.ts diff --git a/ts/test-both/util/filterAndSortConversations_test.ts b/ts/test-node/util/filterAndSortConversations_test.ts similarity index 97% rename from ts/test-both/util/filterAndSortConversations_test.ts rename to ts/test-node/util/filterAndSortConversations_test.ts index 094281de5c..c03901a0e3 100644 --- a/ts/test-both/util/filterAndSortConversations_test.ts +++ b/ts/test-node/util/filterAndSortConversations_test.ts @@ -3,7 +3,7 @@ import { assert } from 'chai'; import { pick } from 'lodash'; -import { getDefaultConversation } from '../helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { filterAndSortConversations } from '../../util/filterAndSortConversations'; import type { ConversationType } from '../../state/ducks/conversations'; diff --git a/ts/test-both/util/getAvatarData_test.ts b/ts/test-node/util/getAvatarData_test.ts similarity index 93% rename from ts/test-both/util/getAvatarData_test.ts rename to ts/test-node/util/getAvatarData_test.ts index cda22c887d..b18149dab9 100644 --- a/ts/test-both/util/getAvatarData_test.ts +++ b/ts/test-node/util/getAvatarData_test.ts @@ -3,7 +3,7 @@ import { assert } from 'chai'; import { v4 as uuid } from 'uuid'; -import { getRandomColor } from '../helpers/getRandomColor'; +import { getRandomColor } from '../../test-helpers/getRandomColor'; import { getAvatarData } from '../../util/getAvatarData'; diff --git a/ts/test-both/util/getClassNamesFor_test.ts b/ts/test-node/util/getClassNamesFor_test.ts similarity index 100% rename from ts/test-both/util/getClassNamesFor_test.ts rename to ts/test-node/util/getClassNamesFor_test.ts diff --git a/ts/test-both/util/getCustomColorStyle.ts b/ts/test-node/util/getCustomColorStyle.ts similarity index 100% rename from ts/test-both/util/getCustomColorStyle.ts rename to ts/test-node/util/getCustomColorStyle.ts diff --git a/ts/test-both/util/getFontNameByTextScript_test.ts b/ts/test-node/util/getFontNameByTextScript_test.ts similarity index 100% rename from ts/test-both/util/getFontNameByTextScript_test.ts rename to ts/test-node/util/getFontNameByTextScript_test.ts diff --git a/ts/test-both/util/getGroupMemberships_test.ts b/ts/test-node/util/getGroupMemberships_test.ts similarity index 98% rename from ts/test-both/util/getGroupMemberships_test.ts rename to ts/test-node/util/getGroupMemberships_test.ts index 17f7aa18bf..5740b1e7f6 100644 --- a/ts/test-both/util/getGroupMemberships_test.ts +++ b/ts/test-node/util/getGroupMemberships_test.ts @@ -6,7 +6,7 @@ import type { ConversationType } from '../../state/ducks/conversations'; import { generateAci } from '../../types/ServiceId'; import { normalizeAci } from '../../util/normalizeAci'; import type { ServiceIdString } from '../../types/ServiceId'; -import { getDefaultConversationWithServiceId } from '../helpers/getDefaultConversation'; +import { getDefaultConversationWithServiceId } from '../../test-helpers/getDefaultConversation'; import { getGroupMemberships } from '../../util/getGroupMemberships'; diff --git a/ts/test-both/util/getHSL_test.ts b/ts/test-node/util/getHSL_test.ts similarity index 100% rename from ts/test-both/util/getHSL_test.ts rename to ts/test-node/util/getHSL_test.ts diff --git a/ts/test-both/util/getInitials_test.ts b/ts/test-node/util/getInitials_test.ts similarity index 100% rename from ts/test-both/util/getInitials_test.ts rename to ts/test-node/util/getInitials_test.ts diff --git a/ts/test-both/util/getMuteOptions_test.ts b/ts/test-node/util/getMuteOptions_test.ts similarity index 100% rename from ts/test-both/util/getMuteOptions_test.ts rename to ts/test-node/util/getMuteOptions_test.ts diff --git a/ts/test-both/util/getMutedUntilText_test.ts b/ts/test-node/util/getMutedUntilText_test.ts similarity index 100% rename from ts/test-both/util/getMutedUntilText_test.ts rename to ts/test-node/util/getMutedUntilText_test.ts diff --git a/ts/test-both/util/getStreamWithTimeout_test.ts b/ts/test-node/util/getStreamWithTimeout_test.ts similarity index 100% rename from ts/test-both/util/getStreamWithTimeout_test.ts rename to ts/test-node/util/getStreamWithTimeout_test.ts diff --git a/ts/test-both/util/graphemeAndLinkAwareSlice.ts b/ts/test-node/util/graphemeAndLinkAwareSlice.ts similarity index 100% rename from ts/test-both/util/graphemeAndLinkAwareSlice.ts rename to ts/test-node/util/graphemeAndLinkAwareSlice.ts diff --git a/ts/test-both/util/grapheme_test.ts b/ts/test-node/util/grapheme_test.ts similarity index 100% rename from ts/test-both/util/grapheme_test.ts rename to ts/test-node/util/grapheme_test.ts diff --git a/ts/test-both/util/groupMemberNameCollisions_test.ts b/ts/test-node/util/groupMemberNameCollisions_test.ts similarity index 98% rename from ts/test-both/util/groupMemberNameCollisions_test.ts rename to ts/test-node/util/groupMemberNameCollisions_test.ts index e934876f0d..6eabcf538c 100644 --- a/ts/test-both/util/groupMemberNameCollisions_test.ts +++ b/ts/test-node/util/groupMemberNameCollisions_test.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: AGPL-3.0-only import { assert } from 'chai'; -import { getDefaultConversation } from '../helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { dehydrateCollisionsWithConversations, diff --git a/ts/test-both/util/isConversationMuted_test.ts b/ts/test-node/util/isConversationMuted_test.ts similarity index 100% rename from ts/test-both/util/isConversationMuted_test.ts rename to ts/test-node/util/isConversationMuted_test.ts diff --git a/ts/test-both/util/isConversationNameKnown_test.ts b/ts/test-node/util/isConversationNameKnown_test.ts similarity index 100% rename from ts/test-both/util/isConversationNameKnown_test.ts rename to ts/test-node/util/isConversationNameKnown_test.ts diff --git a/ts/test-both/util/isConversationSMSOnly_test.ts b/ts/test-node/util/isConversationSMSOnly_test.ts similarity index 100% rename from ts/test-both/util/isConversationSMSOnly_test.ts rename to ts/test-node/util/isConversationSMSOnly_test.ts diff --git a/ts/test-both/util/isConversationUnread_test.ts b/ts/test-node/util/isConversationUnread_test.ts similarity index 100% rename from ts/test-both/util/isConversationUnread_test.ts rename to ts/test-node/util/isConversationUnread_test.ts diff --git a/ts/test-both/util/isConversationUnregistered_test.ts b/ts/test-node/util/isConversationUnregistered_test.ts similarity index 100% rename from ts/test-both/util/isConversationUnregistered_test.ts rename to ts/test-node/util/isConversationUnregistered_test.ts diff --git a/ts/test-both/util/isInSystemContacts_test.ts b/ts/test-node/util/isInSystemContacts_test.ts similarity index 100% rename from ts/test-both/util/isInSystemContacts_test.ts rename to ts/test-node/util/isInSystemContacts_test.ts diff --git a/ts/test-both/util/isMessageUnread_test.ts b/ts/test-node/util/isMessageUnread_test.ts similarity index 100% rename from ts/test-both/util/isMessageUnread_test.ts rename to ts/test-node/util/isMessageUnread_test.ts diff --git a/ts/test-both/util/isNormalNumber_test.ts b/ts/test-node/util/isNormalNumber_test.ts similarity index 100% rename from ts/test-both/util/isNormalNumber_test.ts rename to ts/test-node/util/isNormalNumber_test.ts diff --git a/ts/test-both/util/isNotNil_test.ts b/ts/test-node/util/isNotNil_test.ts similarity index 100% rename from ts/test-both/util/isNotNil_test.ts rename to ts/test-node/util/isNotNil_test.ts diff --git a/ts/test-both/util/isRecord_test.ts b/ts/test-node/util/isRecord_test.ts similarity index 100% rename from ts/test-both/util/isRecord_test.ts rename to ts/test-node/util/isRecord_test.ts diff --git a/ts/test-both/util/isSorted_test.ts b/ts/test-node/util/isSorted_test.ts similarity index 100% rename from ts/test-both/util/isSorted_test.ts rename to ts/test-node/util/isSorted_test.ts diff --git a/ts/test-both/util/isValidE164_test.ts b/ts/test-node/util/isValidE164_test.ts similarity index 100% rename from ts/test-both/util/isValidE164_test.ts rename to ts/test-node/util/isValidE164_test.ts diff --git a/ts/test-both/util/isValidUuid.ts b/ts/test-node/util/isValidUuid.ts similarity index 100% rename from ts/test-both/util/isValidUuid.ts rename to ts/test-node/util/isValidUuid.ts diff --git a/ts/test-both/util/iterables_test.ts b/ts/test-node/util/iterables_test.ts similarity index 100% rename from ts/test-both/util/iterables_test.ts rename to ts/test-node/util/iterables_test.ts diff --git a/ts/test-both/util/libphonenumberUtil_test.ts b/ts/test-node/util/libphonenumberUtil_test.ts similarity index 100% rename from ts/test-both/util/libphonenumberUtil_test.ts rename to ts/test-node/util/libphonenumberUtil_test.ts diff --git a/ts/test-both/util/logPadding_test.ts b/ts/test-node/util/logPadding_test.ts similarity index 100% rename from ts/test-both/util/logPadding_test.ts rename to ts/test-node/util/logPadding_test.ts diff --git a/ts/test-both/util/makeLookup_test.ts b/ts/test-node/util/makeLookup_test.ts similarity index 100% rename from ts/test-both/util/makeLookup_test.ts rename to ts/test-node/util/makeLookup_test.ts diff --git a/ts/test-both/util/mapUtil_test.ts b/ts/test-node/util/mapUtil_test.ts similarity index 100% rename from ts/test-both/util/mapUtil_test.ts rename to ts/test-node/util/mapUtil_test.ts diff --git a/ts/test-both/util/normalizeDeviceName_test.ts b/ts/test-node/util/normalizeDeviceName_test.ts similarity index 100% rename from ts/test-both/util/normalizeDeviceName_test.ts rename to ts/test-node/util/normalizeDeviceName_test.ts diff --git a/ts/test-both/util/parseIntOrThrow_test.ts b/ts/test-node/util/parseIntOrThrow_test.ts similarity index 100% rename from ts/test-both/util/parseIntOrThrow_test.ts rename to ts/test-node/util/parseIntOrThrow_test.ts diff --git a/ts/test-both/util/parseIntWithFallback_test.ts b/ts/test-node/util/parseIntWithFallback_test.ts similarity index 100% rename from ts/test-both/util/parseIntWithFallback_test.ts rename to ts/test-node/util/parseIntWithFallback_test.ts diff --git a/ts/test-both/util/parseRetryAfter_test.ts b/ts/test-node/util/parseRetryAfter_test.ts similarity index 100% rename from ts/test-both/util/parseRetryAfter_test.ts rename to ts/test-node/util/parseRetryAfter_test.ts diff --git a/ts/test-both/util/prependStream_test.ts b/ts/test-node/util/prependStream_test.ts similarity index 100% rename from ts/test-both/util/prependStream_test.ts rename to ts/test-node/util/prependStream_test.ts diff --git a/ts/test-both/util/privacy_test.ts b/ts/test-node/util/privacy_test.ts similarity index 100% rename from ts/test-both/util/privacy_test.ts rename to ts/test-node/util/privacy_test.ts diff --git a/ts/test-both/util/reallyJsonStringify_test.ts b/ts/test-node/util/reallyJsonStringify_test.ts similarity index 100% rename from ts/test-both/util/reallyJsonStringify_test.ts rename to ts/test-node/util/reallyJsonStringify_test.ts diff --git a/ts/test-both/util/replaceIndex_test.ts b/ts/test-node/util/replaceIndex_test.ts similarity index 100% rename from ts/test-both/util/replaceIndex_test.ts rename to ts/test-node/util/replaceIndex_test.ts diff --git a/ts/test-both/util/retryPlaceholders_test.ts b/ts/test-node/util/retryPlaceholders_test.ts similarity index 100% rename from ts/test-both/util/retryPlaceholders_test.ts rename to ts/test-node/util/retryPlaceholders_test.ts diff --git a/ts/test-both/util/searchConversationTitles_test.ts b/ts/test-node/util/searchConversationTitles_test.ts similarity index 94% rename from ts/test-both/util/searchConversationTitles_test.ts rename to ts/test-node/util/searchConversationTitles_test.ts index 2d0e15af70..81175da926 100644 --- a/ts/test-both/util/searchConversationTitles_test.ts +++ b/ts/test-node/util/searchConversationTitles_test.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: AGPL-3.0-only import { assert } from 'chai'; -import { getDefaultConversation } from '../helpers/getDefaultConversation'; +import { getDefaultConversation } from '../../test-helpers/getDefaultConversation'; import { searchConversationTitles } from '../../util/searchConversationTitles'; describe('searchContactTitles', () => { diff --git a/ts/test-both/util/search_test.ts b/ts/test-node/util/search_test.ts similarity index 100% rename from ts/test-both/util/search_test.ts rename to ts/test-node/util/search_test.ts diff --git a/ts/test-both/util/serverAlerts_test.ts b/ts/test-node/util/serverAlerts_test.ts similarity index 100% rename from ts/test-both/util/serverAlerts_test.ts rename to ts/test-node/util/serverAlerts_test.ts diff --git a/ts/test-both/util/sessionTranslation_test.ts b/ts/test-node/util/sessionTranslation_test.ts similarity index 100% rename from ts/test-both/util/sessionTranslation_test.ts rename to ts/test-node/util/sessionTranslation_test.ts diff --git a/ts/test-both/util/setUtil_test.ts b/ts/test-node/util/setUtil_test.ts similarity index 100% rename from ts/test-both/util/setUtil_test.ts rename to ts/test-node/util/setUtil_test.ts diff --git a/ts/test-both/util/startTimeTravelDetector_test.ts b/ts/test-node/util/startTimeTravelDetector_test.ts similarity index 100% rename from ts/test-both/util/startTimeTravelDetector_test.ts rename to ts/test-node/util/startTimeTravelDetector_test.ts diff --git a/ts/test-both/util/theme_test.ts b/ts/test-node/util/theme_test.ts similarity index 100% rename from ts/test-both/util/theme_test.ts rename to ts/test-node/util/theme_test.ts diff --git a/ts/test-both/util/timelineUtil_test.ts b/ts/test-node/util/timelineUtil_test.ts similarity index 100% rename from ts/test-both/util/timelineUtil_test.ts rename to ts/test-node/util/timelineUtil_test.ts diff --git a/ts/test-both/util/timestampLongUtils_test.ts b/ts/test-node/util/timestampLongUtils_test.ts similarity index 100% rename from ts/test-both/util/timestampLongUtils_test.ts rename to ts/test-node/util/timestampLongUtils_test.ts diff --git a/ts/test-both/util/timestamp_test.ts b/ts/test-node/util/timestamp_test.ts similarity index 100% rename from ts/test-both/util/timestamp_test.ts rename to ts/test-node/util/timestamp_test.ts diff --git a/ts/test-both/util/unicodeBidi_test.ts b/ts/test-node/util/unicodeBidi_test.ts similarity index 100% rename from ts/test-both/util/unicodeBidi_test.ts rename to ts/test-node/util/unicodeBidi_test.ts diff --git a/ts/test-both/util/url_test.ts b/ts/test-node/util/url_test.ts similarity index 100% rename from ts/test-both/util/url_test.ts rename to ts/test-node/util/url_test.ts diff --git a/ts/test-both/util/userLanguages_test.ts b/ts/test-node/util/userLanguages_test.ts similarity index 100% rename from ts/test-both/util/userLanguages_test.ts rename to ts/test-node/util/userLanguages_test.ts diff --git a/ts/test-both/util/version_test.ts b/ts/test-node/util/version_test.ts similarity index 100% rename from ts/test-both/util/version_test.ts rename to ts/test-node/util/version_test.ts diff --git a/ts/test-both/util/waitBatcher_test.ts b/ts/test-node/util/waitBatcher_test.ts similarity index 100% rename from ts/test-both/util/waitBatcher_test.ts rename to ts/test-node/util/waitBatcher_test.ts diff --git a/ts/test-both/util/waitForAll.ts b/ts/test-node/util/waitForAll.ts similarity index 100% rename from ts/test-both/util/waitForAll.ts rename to ts/test-node/util/waitForAll.ts diff --git a/ts/test-both/util/webSafeBase64_test.ts b/ts/test-node/util/webSafeBase64_test.ts similarity index 100% rename from ts/test-both/util/webSafeBase64_test.ts rename to ts/test-node/util/webSafeBase64_test.ts