Reorganize test cases

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",

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;

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;
 

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;
 

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';

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;
 

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;
 

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;
 

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;
 

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';
 

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;
 

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';

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';
 

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;
 

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;
 

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;
 

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;

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;

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;
 

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';
 

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';

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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',

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;
 

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';
 

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';

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';

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';

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;

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;
 

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';
 

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;
 

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;

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;

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';
 

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;

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;

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,

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,

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';
 

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';
 

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);

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';
 

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;
 

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;

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;

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;
 

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;

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 =

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;
 

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';
 

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';
 

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;
 

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;
 

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;
 

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;
 

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',

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';
 

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';
 

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;
 

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;
 

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';

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';

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';

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';
 

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();

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',

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',

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';

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;
 

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';
 

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;
 

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;

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;
 

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';
 

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';

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;

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 =

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';

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';

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';

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;

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',

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;
 

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;
 

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';

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,

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 {

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;
 

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;
 

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;

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';
 

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();
 

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 = {

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();