diff --git a/eslint.config.mjs b/eslint.config.mjs index fccbb7454b..772e5011cd 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -92,7 +92,7 @@ export default tseslint.config( }, }, { - files: ['run/test/specs/locators/*'], + files: ['run/test/locators/*'], rules: { 'perfectionist/sort-modules': 'error', }, diff --git a/global-setup.ts b/global-setup.ts index b6a0ef8057..cb10a4c5bd 100644 --- a/global-setup.ts +++ b/global-setup.ts @@ -1,7 +1,7 @@ import { FullConfig } from '@playwright/test'; -import { getNetworkTarget } from './run/test/specs/utils/devnet'; -import { SupportedPlatformsType } from './run/test/specs/utils/open_app'; +import { getNetworkTarget } from './run/test/utils/devnet'; +import { SupportedPlatformsType } from './run/test/utils/open_app'; export default async function globalSetup(_config: FullConfig) { const platform = process.env.PLATFORM as SupportedPlatformsType | undefined; diff --git a/playwright.config.ts b/playwright.config.ts index 3e3d64f7cd..4794411a8d 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -4,11 +4,7 @@ dotenv.config({ quiet: true }); import { defineConfig, ReporterDescription } from '@playwright/test'; import { allureResultsDir } from './run/constants/allure'; -import { - getRepeatEachCount, - getRetriesCount, - getWorkersCount, -} from './run/test/specs/utils/binaries'; +import { getRepeatEachCount, getRetriesCount, getWorkersCount } from './run/test/utils/binaries'; // NOTE: without this, the wrong source map is loaded and the stacktraces are all wrong // eslint-disable-next-line @typescript-eslint/no-require-imports diff --git a/run/test/specs/locators/browsers.ts b/run/test/locators/browsers.ts similarity index 100% rename from run/test/specs/locators/browsers.ts rename to run/test/locators/browsers.ts diff --git a/run/test/specs/locators/conversation.ts b/run/test/locators/conversation.ts similarity index 98% rename from run/test/specs/locators/conversation.ts rename to run/test/locators/conversation.ts index 90db7d8423..7efc47b7d3 100644 --- a/run/test/specs/locators/conversation.ts +++ b/run/test/locators/conversation.ts @@ -1,8 +1,8 @@ -import type { DeviceWrapper } from '../../../types/DeviceWrapper'; +import type { DeviceWrapper } from '../../types/DeviceWrapper'; -import { testCommunityName } from '../../../constants/community'; -import { tStripped } from '../../../localizer/lib'; -import { StrategyExtractionObj } from '../../../types/testing'; +import { testCommunityName } from '../../constants/community'; +import { tStripped } from '../../localizer/lib'; +import { StrategyExtractionObj } from '../../types/testing'; import { getAppDisplayName } from '../utils/devnet'; import { LocatorsInterface } from './index'; diff --git a/run/test/specs/locators/disappearing_messages.ts b/run/test/locators/disappearing_messages.ts similarity index 97% rename from run/test/specs/locators/disappearing_messages.ts rename to run/test/locators/disappearing_messages.ts index 251b3fb77e..d21db0384f 100644 --- a/run/test/specs/locators/disappearing_messages.ts +++ b/run/test/locators/disappearing_messages.ts @@ -1,10 +1,10 @@ import { LocatorsInterface } from '.'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; import { DISAPPEARING_TIMES, DisappearingOptions, StrategyExtractionObj, -} from '../../../types/testing'; +} from '../../types/testing'; export class DisableDisappearingMessages extends LocatorsInterface { public build(): StrategyExtractionObj { diff --git a/run/test/specs/locators/external.ts b/run/test/locators/external.ts similarity index 100% rename from run/test/specs/locators/external.ts rename to run/test/locators/external.ts diff --git a/run/test/specs/locators/global.ts b/run/test/locators/global.ts similarity index 99% rename from run/test/specs/locators/global.ts rename to run/test/locators/global.ts index ae7e2707b9..481e69211c 100644 --- a/run/test/specs/locators/global.ts +++ b/run/test/locators/global.ts @@ -1,4 +1,4 @@ -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; import { LocatorsInterface } from './index'; export class AccountIDDisplay extends LocatorsInterface { diff --git a/run/test/specs/locators/global_search.ts b/run/test/locators/global_search.ts similarity index 93% rename from run/test/specs/locators/global_search.ts rename to run/test/locators/global_search.ts index dfdfd637b6..2ece3811cf 100644 --- a/run/test/specs/locators/global_search.ts +++ b/run/test/locators/global_search.ts @@ -1,4 +1,4 @@ -import { StrategyExtractionObj } from '../../../types/testing'; +import { StrategyExtractionObj } from '../../types/testing'; import { LocatorsInterface } from './index'; export class CancelSearchButton extends LocatorsInterface { diff --git a/run/test/specs/locators/groups.ts b/run/test/locators/groups.ts similarity index 97% rename from run/test/specs/locators/groups.ts rename to run/test/locators/groups.ts index 6c03042bf7..bc3570c74d 100644 --- a/run/test/specs/locators/groups.ts +++ b/run/test/locators/groups.ts @@ -1,10 +1,10 @@ import type { UserNameType } from '@session-foundation/qa-seeder'; import { LocatorsInterface } from '.'; -import { tStripped } from '../../../localizer/lib'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { StrategyExtractionObj } from '../../../types/testing'; -import { GROUPNAME } from '../../../types/testing'; +import { tStripped } from '../../localizer/lib'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { StrategyExtractionObj } from '../../types/testing'; +import { GROUPNAME } from '../../types/testing'; export class ConfirmRemovalButton extends LocatorsInterface { public build(): StrategyExtractionObj { diff --git a/run/test/specs/locators/home.ts b/run/test/locators/home.ts similarity index 97% rename from run/test/specs/locators/home.ts rename to run/test/locators/home.ts index 11059f07f2..81cbfff879 100644 --- a/run/test/specs/locators/home.ts +++ b/run/test/locators/home.ts @@ -1,6 +1,6 @@ -import type { DeviceWrapper } from '../../../types/DeviceWrapper'; +import type { DeviceWrapper } from '../../types/DeviceWrapper'; -import { StrategyExtractionObj } from '../../../types/testing'; +import { StrategyExtractionObj } from '../../types/testing'; import { LocatorsInterface } from './index'; export class ConversationItem extends LocatorsInterface { diff --git a/run/test/specs/locators/index.ts b/run/test/locators/index.ts similarity index 98% rename from run/test/specs/locators/index.ts rename to run/test/locators/index.ts index e57bcb3818..2efd043ac0 100644 --- a/run/test/specs/locators/index.ts +++ b/run/test/locators/index.ts @@ -1,6 +1,6 @@ -import { ANDROID_XPATHS, IOS_XPATHS } from '../../../constants'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { StrategyExtractionObj } from '../../../types/testing'; +import { ANDROID_XPATHS, IOS_XPATHS } from '../../constants'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { StrategyExtractionObj } from '../../types/testing'; import { getAppDisplayName } from '../utils/devnet'; import { SupportedPlatformsType } from '../utils/open_app'; diff --git a/run/test/specs/locators/network_page.ts b/run/test/locators/network_page.ts similarity index 97% rename from run/test/specs/locators/network_page.ts rename to run/test/locators/network_page.ts index 3147f645f2..eb117411cc 100644 --- a/run/test/specs/locators/network_page.ts +++ b/run/test/locators/network_page.ts @@ -1,6 +1,6 @@ import { LocatorsInterface } from '.'; -import { tStripped } from '../../../localizer/lib'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { tStripped } from '../../localizer/lib'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; export class LastUpdatedTimeStamp extends LocatorsInterface { private expectedText: string; diff --git a/run/test/specs/locators/onboarding.ts b/run/test/locators/onboarding.ts similarity index 98% rename from run/test/specs/locators/onboarding.ts rename to run/test/locators/onboarding.ts index 5512025c82..ef6544b988 100644 --- a/run/test/specs/locators/onboarding.ts +++ b/run/test/locators/onboarding.ts @@ -1,4 +1,4 @@ -import { StrategyExtractionObj } from '../../../types/testing'; +import { StrategyExtractionObj } from '../../types/testing'; import { LocatorsInterface } from './index'; export class AccountRestoreButton extends LocatorsInterface { diff --git a/run/test/specs/locators/settings.ts b/run/test/locators/settings.ts similarity index 99% rename from run/test/specs/locators/settings.ts rename to run/test/locators/settings.ts index f4264c988b..04b3f933c8 100644 --- a/run/test/specs/locators/settings.ts +++ b/run/test/locators/settings.ts @@ -1,4 +1,4 @@ -import { StrategyExtractionObj } from '../../../types/testing'; +import { StrategyExtractionObj } from '../../types/testing'; import { LocatorsInterface } from './index'; export class AppDisguiseMeetingIcon extends LocatorsInterface { diff --git a/run/test/specs/locators/start_conversation.ts b/run/test/locators/start_conversation.ts similarity index 98% rename from run/test/specs/locators/start_conversation.ts rename to run/test/locators/start_conversation.ts index 5115c0309d..83dcf518fc 100644 --- a/run/test/specs/locators/start_conversation.ts +++ b/run/test/locators/start_conversation.ts @@ -1,4 +1,4 @@ -import { StrategyExtractionObj } from '../../../types/testing'; +import { StrategyExtractionObj } from '../../types/testing'; import { LocatorsInterface } from './index'; export class CloseButton extends LocatorsInterface { diff --git a/run/test/specs/media/profile_picture.jpg b/run/test/media/profile_picture.jpg similarity index 100% rename from run/test/specs/media/profile_picture.jpg rename to run/test/media/profile_picture.jpg diff --git a/run/test/specs/media/test_file.pdf b/run/test/media/test_file.pdf similarity index 100% rename from run/test/specs/media/test_file.pdf rename to run/test/media/test_file.pdf diff --git a/run/test/specs/media/test_image.jpg b/run/test/media/test_image.jpg similarity index 100% rename from run/test/specs/media/test_image.jpg rename to run/test/media/test_image.jpg diff --git a/run/test/specs/media/test_video.mp4 b/run/test/media/test_video.mp4 similarity index 100% rename from run/test/specs/media/test_video.mp4 rename to run/test/media/test_video.mp4 diff --git a/run/test/specs/media/test_video_thumbnail.png b/run/test/media/test_video_thumbnail.png similarity index 100% rename from run/test/specs/media/test_video_thumbnail.png rename to run/test/media/test_video_thumbnail.png diff --git a/run/test/specs/app_disguise_icons.spec.ts b/run/test/specs/app_disguise_icons.spec.ts index 6feb735f01..9340a75c2d 100644 --- a/run/test/specs/app_disguise_icons.spec.ts +++ b/run/test/specs/app_disguise_icons.spec.ts @@ -3,10 +3,10 @@ import { test, type TestInfo } from '@playwright/test'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { AppearanceMenuItem, SelectAppIcon, UserSettings } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { verifyPageScreenshot } from './utils/verify_screenshots'; +import { AppearanceMenuItem, SelectAppIcon, UserSettings } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { verifyPageScreenshot } from '../utils/verify_screenshots'; bothPlatformsIt({ title: 'Check app disguise icon layout', diff --git a/run/test/specs/app_disguise_set.spec.ts b/run/test/specs/app_disguise_set.spec.ts index 2303e2243c..c610fadd90 100644 --- a/run/test/specs/app_disguise_set.spec.ts +++ b/run/test/specs/app_disguise_set.spec.ts @@ -4,22 +4,22 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { DisguisedApp } from './locators/external'; +import { DisguisedApp } from '../locators/external'; import { AppDisguiseMeetingIcon, AppearanceMenuItem, CloseAppButton, SelectAppIcon, UserSettings, -} from './locators/settings'; -import { sleepFor } from './utils'; -import { getAdbFullPath } from './utils/binaries'; -import { androidAppPackage } from './utils/capabilities_android'; -import { iOSBundleId } from './utils/capabilities_ios'; -import { newUser } from './utils/create_account'; -import { openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { closeApp } from './utils/open_app'; -import { runScriptAndLog } from './utils/utilities'; +} from '../locators/settings'; +import { sleepFor } from '../utils'; +import { getAdbFullPath } from '../utils/binaries'; +import { androidAppPackage } from '../utils/capabilities_android'; +import { iOSBundleId } from '../utils/capabilities_ios'; +import { newUser } from '../utils/create_account'; +import { openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { closeApp } from '../utils/open_app'; +import { runScriptAndLog } from '../utils/utilities'; bothPlatformsItSeparate({ title: 'App disguise set icon', diff --git a/run/test/specs/check_avatar_color.spec.ts b/run/test/specs/check_avatar_color.spec.ts index 1a93022ef2..7b8dca142e 100644 --- a/run/test/specs/check_avatar_color.spec.ts +++ b/run/test/specs/check_avatar_color.spec.ts @@ -2,13 +2,13 @@ import { test, type TestInfo } from '@playwright/test'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { ConversationSettings } from './locators/conversation'; -import { ConversationItem } from './locators/home'; -import { UserAvatar, UserSettings } from './locators/settings'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { isSameColor } from './utils/check_colour'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { ConversationSettings } from '../locators/conversation'; +import { ConversationItem } from '../locators/home'; +import { UserAvatar, UserSettings } from '../locators/settings'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { isSameColor } from '../utils/check_colour'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Check placeholder avatar color', diff --git a/run/test/specs/community_emoji_react.spec.ts b/run/test/specs/community_emoji_react.spec.ts index b892079215..fb80818368 100644 --- a/run/test/specs/community_emoji_react.spec.ts +++ b/run/test/specs/community_emoji_react.spec.ts @@ -3,10 +3,10 @@ import { test, type TestInfo } from '@playwright/test'; import { testCommunityLink, testCommunityName } from '../../constants/community'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { EmojiReactsPill, FirstEmojiReact, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { joinCommunity } from './utils/join_community'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { EmojiReactsPill, FirstEmojiReact, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { joinCommunity } from '../utils/join_community'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send emoji react community', diff --git a/run/test/specs/community_requests_off.spec.ts b/run/test/specs/community_requests_off.spec.ts index 5575b0ea80..83f598b194 100644 --- a/run/test/specs/community_requests_off.spec.ts +++ b/run/test/specs/community_requests_off.spec.ts @@ -4,11 +4,11 @@ import { USERNAME } from '@session-foundation/qa-seeder'; import { testCommunityLink, testCommunityName } from '../../constants/community'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { CommunityMessageAuthor, UPMMessageButton } from './locators/conversation'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { joinCommunity } from './utils/join_community'; -import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app'; +import { CommunityMessageAuthor, UPMMessageButton } from '../locators/conversation'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { joinCommunity } from '../utils/join_community'; +import { closeApp, openAppTwoDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Community message requests off', diff --git a/run/test/specs/community_requests_on.spec.ts b/run/test/specs/community_requests_on.spec.ts index 1a7a53b89a..6238127f3a 100644 --- a/run/test/specs/community_requests_on.spec.ts +++ b/run/test/specs/community_requests_on.spec.ts @@ -4,7 +4,7 @@ import { USERNAME } from '@session-foundation/qa-seeder'; import { testCommunityLink, testCommunityName } from '../../constants/community'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { CloseSettings } from './locators'; +import { CloseSettings } from '../locators'; import { CommunityMessageAuthor, ConversationHeaderName, @@ -12,13 +12,13 @@ import { MessageRequestAcceptDescription, MessageRequestPendingDescription, UPMMessageButton, -} from './locators/conversation'; -import { MessageRequestsBanner } from './locators/home'; -import { CommunityMessageRequestSwitch, PrivacyMenuItem, UserSettings } from './locators/settings'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { joinCommunity } from './utils/join_community'; -import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { MessageRequestsBanner } from '../locators/home'; +import { CommunityMessageRequestSwitch, PrivacyMenuItem, UserSettings } from '../locators/settings'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { joinCommunity } from '../utils/join_community'; +import { closeApp, openAppTwoDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Community message requests on', diff --git a/run/test/specs/community_tests_image.spec.ts b/run/test/specs/community_tests_image.spec.ts index d6e83c3a41..3858870c33 100644 --- a/run/test/specs/community_tests_image.spec.ts +++ b/run/test/specs/community_tests_image.spec.ts @@ -3,11 +3,11 @@ import { test, type TestInfo } from '@playwright/test'; import { testCommunityLink, testCommunityName } from '../../constants/community'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { joinCommunity } from './utils/join_community'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { joinCommunity } from '../utils/join_community'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send image to community', diff --git a/run/test/specs/community_tests_join.spec.ts b/run/test/specs/community_tests_join.spec.ts index c693693f9b..d07d4d9853 100644 --- a/run/test/specs/community_tests_join.spec.ts +++ b/run/test/specs/community_tests_join.spec.ts @@ -3,11 +3,11 @@ import { test, type TestInfo } from '@playwright/test'; import { testCommunityLink, testCommunityName } from '../../constants/community'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { ConversationItem } from './locators/home'; -import { open_Alice2 } from './state_builder'; -import { sleepFor } from './utils'; -import { joinCommunity } from './utils/join_community'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { ConversationItem } from '../locators/home'; +import { open_Alice2 } from '../state_builder'; +import { sleepFor } from '../utils'; +import { joinCommunity } from '../utils/join_community'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Join community test', diff --git a/run/test/specs/cta_donate_review.spec.ts b/run/test/specs/cta_donate_review.spec.ts index 00bd38bdcf..6000863d39 100644 --- a/run/test/specs/cta_donate_review.spec.ts +++ b/run/test/specs/cta_donate_review.spec.ts @@ -4,14 +4,14 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { CloseSettings } from './locators'; -import { CTAButtonPositive } from './locators/global'; -import { ReviewPromptItsGreatButton } from './locators/home'; -import { PathMenuItem, UserSettings } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { forceStopAndRestart as forceStopAndRestartApp } from './utils/utilities'; -import { verifyPageScreenshot } from './utils/verify_screenshots'; +import { CloseSettings } from '../locators'; +import { CTAButtonPositive } from '../locators/global'; +import { ReviewPromptItsGreatButton } from '../locators/home'; +import { PathMenuItem, UserSettings } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { forceStopAndRestart as forceStopAndRestartApp } from '../utils/utilities'; +import { verifyPageScreenshot } from '../utils/verify_screenshots'; bothPlatformsIt({ title: 'Donate CTA shows after positive review', diff --git a/run/test/specs/cta_donate_time.spec.ts b/run/test/specs/cta_donate_time.spec.ts index 808e7cb5a2..06844e0f0e 100644 --- a/run/test/specs/cta_donate_time.spec.ts +++ b/run/test/specs/cta_donate_time.spec.ts @@ -4,16 +4,16 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { iosIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { CTAButtonPositive } from './locators/global'; -import { PlusButton } from './locators/home'; -import { newUser } from './utils/create_account'; +import { CTAButtonPositive } from '../locators/global'; +import { PlusButton } from '../locators/home'; +import { newUser } from '../utils/create_account'; import { closeApp, IOSTestContext, openAppOnPlatformSingleDevice, SupportedPlatformsType, -} from './utils/open_app'; -import { setIOSFirstInstallDate } from './utils/time_travel'; +} from '../utils/open_app'; +import { setIOSFirstInstallDate } from '../utils/time_travel'; // iOS uses app-level time override (customFirstInstallDateTime capability). // Android would require system-level time manipulation (`adb root` + `toybox date`), which diff --git a/run/test/specs/disappear_after_read.spec.ts b/run/test/specs/disappear_after_read.spec.ts index ffaddd951d..1b9773eba3 100644 --- a/run/test/specs/disappear_after_read.spec.ts +++ b/run/test/specs/disappear_after_read.spec.ts @@ -3,11 +3,11 @@ import { test, type TestInfo } from '@playwright/test'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES, DisappearModes } from '../../types/testing'; -import { MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { checkDisappearingControlMessage } from './utils/disappearing_control_messages'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { checkDisappearingControlMessage } from '../utils/disappearing_control_messages'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappear after read', diff --git a/run/test/specs/disappear_after_send.spec.ts b/run/test/specs/disappear_after_send.spec.ts index b19ffb2027..e1c6b6d702 100644 --- a/run/test/specs/disappear_after_send.spec.ts +++ b/run/test/specs/disappear_after_send.spec.ts @@ -2,11 +2,11 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DisappearActions, DISAPPEARING_TIMES, DisappearModes } from '../../types/testing'; -import { MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { checkDisappearingControlMessage } from './utils/disappearing_control_messages'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { checkDisappearingControlMessage } from '../utils/disappearing_control_messages'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappear after send', diff --git a/run/test/specs/disappear_after_send_groups.spec.ts b/run/test/specs/disappear_after_send_groups.spec.ts index b3d23f2cf8..0ad50a7e1e 100644 --- a/run/test/specs/disappear_after_send_groups.spec.ts +++ b/run/test/specs/disappear_after_send_groups.spec.ts @@ -4,10 +4,10 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DisappearActions, DISAPPEARING_TIMES } from '../../types/testing'; -import { MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappear after send groups', diff --git a/run/test/specs/disappear_after_send_note_to_self.spec.ts b/run/test/specs/disappear_after_send_note_to_self.spec.ts index fb7ed8ad5b..f5d77399d3 100644 --- a/run/test/specs/disappear_after_send_note_to_self.spec.ts +++ b/run/test/specs/disappear_after_send_note_to_self.spec.ts @@ -3,13 +3,13 @@ import { test, type TestInfo } from '@playwright/test'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DisappearActions, DISAPPEARING_TIMES, USERNAME } from '../../types/testing'; -import { MessageBody } from './locators/conversation'; -import { PlusButton } from './locators/home'; -import { EnterAccountID, NewMessageOption, NextButton } from './locators/start_conversation'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MessageBody } from '../locators/conversation'; +import { PlusButton } from '../locators/home'; +import { EnterAccountID, NewMessageOption, NextButton } from '../locators/start_conversation'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappear after send note to self', diff --git a/run/test/specs/disappear_after_send_off_1o1.spec.ts b/run/test/specs/disappear_after_send_off_1o1.spec.ts index c98f2efbdf..fcef4670d0 100644 --- a/run/test/specs/disappear_after_send_off_1o1.spec.ts +++ b/run/test/specs/disappear_after_send_off_1o1.spec.ts @@ -3,19 +3,19 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DisappearActions, DISAPPEARING_TIMES, DisappearModes } from '../../types/testing'; -import { ConversationSettings } from './locators/conversation'; +import { ConversationSettings } from '../locators/conversation'; import { DisableDisappearingMessages, DisappearingMessagesMenuOption, DisappearingMessagesSubtitle, FollowSettingsButton, SetDisappearMessagesButton, -} from './locators/disappearing_messages'; -import { open_Alice2_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { checkDisappearingControlMessage } from './utils/disappearing_control_messages'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +} from '../locators/disappearing_messages'; +import { open_Alice2_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { checkDisappearingControlMessage } from '../utils/disappearing_control_messages'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappear after send off 1:1', diff --git a/run/test/specs/disappearing_call.spec.ts b/run/test/specs/disappearing_call.spec.ts index 708db9803f..e7c16ac421 100644 --- a/run/test/specs/disappearing_call.spec.ts +++ b/run/test/specs/disappearing_call.spec.ts @@ -4,12 +4,12 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { CloseSettings } from './locators'; -import { CallButton, NotificationsModalButton, NotificationSwitch } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { CloseSettings } from '../locators'; +import { CallButton, NotificationsModalButton, NotificationSwitch } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsItSeparate({ title: 'Disappearing call message 1:1', diff --git a/run/test/specs/disappearing_community_invite.spec.ts b/run/test/specs/disappearing_community_invite.spec.ts index 8bf16c4802..d7c9ddcf3c 100644 --- a/run/test/specs/disappearing_community_invite.spec.ts +++ b/run/test/specs/disappearing_community_invite.spec.ts @@ -1,21 +1,21 @@ import type { TestInfo } from '@playwright/test'; +import { testCommunityLink, testCommunityName } from '../../constants/community'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { testCommunityLink, testCommunityName } from './../../constants/community'; -import { InviteContactsMenuItem } from './locators'; +import { InviteContactsMenuItem } from '../locators'; import { CommunityInvitation, CommunityInviteConfirmButton, ConversationSettings, -} from './locators/conversation'; -import { GroupMember } from './locators/groups'; -import { ConversationItem } from './locators/home'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { joinCommunity } from './utils/join_community'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +} from '../locators/conversation'; +import { GroupMember } from '../locators/groups'; +import { ConversationItem } from '../locators/home'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { joinCommunity } from '../utils/join_community'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing community invite message 1:1', diff --git a/run/test/specs/disappearing_gif.spec.ts b/run/test/specs/disappearing_gif.spec.ts index 220924bda9..812e47773e 100644 --- a/run/test/specs/disappearing_gif.spec.ts +++ b/run/test/specs/disappearing_gif.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES, USERNAME } from '../../types/testing'; -import { MediaMessage } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MediaMessage } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing GIF message 1:1', diff --git a/run/test/specs/disappearing_image.spec.ts b/run/test/specs/disappearing_image.spec.ts index e4d98645c5..afa7d4313e 100644 --- a/run/test/specs/disappearing_image.spec.ts +++ b/run/test/specs/disappearing_image.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { MediaMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MediaMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing image message 1:1', diff --git a/run/test/specs/disappearing_link.spec.ts b/run/test/specs/disappearing_link.spec.ts index 2eb80fca1d..adf01dc066 100644 --- a/run/test/specs/disappearing_link.spec.ts +++ b/run/test/specs/disappearing_link.spec.ts @@ -5,18 +5,18 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { LinkPreview, LinkPreviewMessage } from './locators'; +import { LinkPreview, LinkPreviewMessage } from '../locators'; import { MessageBody, MessageInput, OutgoingMessageStatusSent, SendButton, -} from './locators/conversation'; -import { EnableLinkPreviewsModalButton } from './locators/global'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +} from '../locators/conversation'; +import { EnableLinkPreviewsModalButton } from '../locators/global'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsItSeparate({ title: 'Disappearing link message 1:1', diff --git a/run/test/specs/disappearing_video.spec.ts b/run/test/specs/disappearing_video.spec.ts index 67df3bb6fe..9c81c6d418 100644 --- a/run/test/specs/disappearing_video.spec.ts +++ b/run/test/specs/disappearing_video.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { MediaMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MediaMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing video message 1:1', diff --git a/run/test/specs/disappearing_voice.spec.ts b/run/test/specs/disappearing_voice.spec.ts index 54713a7133..ba6718a829 100644 --- a/run/test/specs/disappearing_voice.spec.ts +++ b/run/test/specs/disappearing_voice.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { VoiceMessage } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { VoiceMessage } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing voice message 1:1', diff --git a/run/test/specs/donate.spec.ts b/run/test/specs/donate.spec.ts index 9d13087b0a..31bda2eea5 100644 --- a/run/test/specs/donate.spec.ts +++ b/run/test/specs/donate.spec.ts @@ -3,13 +3,13 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { SafariAddressBar, URLInputField } from './locators/browsers'; -import { OpenLinkButton } from './locators/network_page'; -import { DonationsMenuItem, UserSettings } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { handleChromeFirstTimeOpen } from './utils/handle_first_open'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { assertUrlIsReachable, ensureHttpsURL } from './utils/utilities'; +import { SafariAddressBar, URLInputField } from '../locators/browsers'; +import { OpenLinkButton } from '../locators/network_page'; +import { DonationsMenuItem, UserSettings } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { handleChromeFirstTimeOpen } from '../utils/handle_first_open'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { assertUrlIsReachable, ensureHttpsURL } from '../utils/utilities'; bothPlatformsIt({ title: 'Donate Settings menu item', diff --git a/run/test/specs/group_disappearing_messages_gif.spec.ts b/run/test/specs/group_disappearing_messages_gif.spec.ts index 7d396e0fef..9c9c70eef0 100644 --- a/run/test/specs/group_disappearing_messages_gif.spec.ts +++ b/run/test/specs/group_disappearing_messages_gif.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { MediaMessage } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MediaMessage } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing GIF to group', diff --git a/run/test/specs/group_disappearing_messages_image.spec.ts b/run/test/specs/group_disappearing_messages_image.spec.ts index c8fe127862..47ffbddf62 100644 --- a/run/test/specs/group_disappearing_messages_image.spec.ts +++ b/run/test/specs/group_disappearing_messages_image.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { MediaMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MediaMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing image message to group', diff --git a/run/test/specs/group_disappearing_messages_link.spec.ts b/run/test/specs/group_disappearing_messages_link.spec.ts index 25e13320fd..226834583d 100644 --- a/run/test/specs/group_disappearing_messages_link.spec.ts +++ b/run/test/specs/group_disappearing_messages_link.spec.ts @@ -5,18 +5,18 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { LinkPreviewMessage } from './locators'; +import { LinkPreviewMessage } from '../locators'; import { MessageBody, MessageInput, OutgoingMessageStatusSent, SendButton, -} from './locators/conversation'; -import { EnableLinkPreviewsModalButton } from './locators/global'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +} from '../locators/conversation'; +import { EnableLinkPreviewsModalButton } from '../locators/global'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing link to group', diff --git a/run/test/specs/group_disappearing_messages_members.spec.ts b/run/test/specs/group_disappearing_messages_members.spec.ts index bcbf8e6b5d..33e728eabc 100644 --- a/run/test/specs/group_disappearing_messages_members.spec.ts +++ b/run/test/specs/group_disappearing_messages_members.spec.ts @@ -2,14 +2,14 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { ConversationSettings } from './locators/conversation'; +import { ConversationSettings } from '../locators/conversation'; import { DisappearingMessageRadial, DisappearingMessagesMenuOption, SetDisappearMessagesButton, -} from './locators/disappearing_messages'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/disappearing_messages'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Group member disappearing messages', diff --git a/run/test/specs/group_disappearing_messages_video.spec.ts b/run/test/specs/group_disappearing_messages_video.spec.ts index 1ae36d83eb..20d3d048c1 100644 --- a/run/test/specs/group_disappearing_messages_video.spec.ts +++ b/run/test/specs/group_disappearing_messages_video.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES } from '../../types/testing'; -import { MediaMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { MediaMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing video to group', diff --git a/run/test/specs/group_disappearing_messages_voice.spec.ts b/run/test/specs/group_disappearing_messages_voice.spec.ts index 83c1bf6a02..25862d0a7c 100644 --- a/run/test/specs/group_disappearing_messages_voice.spec.ts +++ b/run/test/specs/group_disappearing_messages_voice.spec.ts @@ -2,9 +2,9 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { DISAPPEARING_TIMES, GROUPNAME } from '../../types/testing'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { setDisappearingMessage } from './utils/set_disappearing_messages'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { setDisappearingMessage } from '../utils/set_disappearing_messages'; bothPlatformsIt({ title: 'Disappearing voice message to group', diff --git a/run/test/specs/group_message_delete.spec.ts b/run/test/specs/group_message_delete.spec.ts index 5857de4f4e..4cc72479fb 100644 --- a/run/test/specs/group_message_delete.spec.ts +++ b/run/test/specs/group_message_delete.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { DeleteMessageConfirmationModal, DeleteMessageLocally } from './locators'; -import { DeletedMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { DeleteMessageConfirmationModal, DeleteMessageLocally } from '../locators'; +import { DeletedMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete message locally in group', diff --git a/run/test/specs/group_message_document.spec.ts b/run/test/specs/group_message_document.spec.ts index deeb17d4f1..b2824ffad6 100644 --- a/run/test/specs/group_message_document.spec.ts +++ b/run/test/specs/group_message_document.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; -import { DocumentMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { DocumentMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Send document to group', diff --git a/run/test/specs/group_message_gif.spec.ts b/run/test/specs/group_message_gif.spec.ts index fffd0d6031..075edb9304 100644 --- a/run/test/specs/group_message_gif.spec.ts +++ b/run/test/specs/group_message_gif.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; -import { MediaMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MediaMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Send GIF to group', diff --git a/run/test/specs/group_message_image.spec.ts b/run/test/specs/group_message_image.spec.ts index adfb3ba513..30ad7ae569 100644 --- a/run/test/specs/group_message_image.spec.ts +++ b/run/test/specs/group_message_image.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; -import { MediaMessage, MessageBody, OutgoingMessageStatusSent } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MediaMessage, MessageBody, OutgoingMessageStatusSent } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Send image to group', diff --git a/run/test/specs/group_message_link_preview.spec.ts b/run/test/specs/group_message_link_preview.spec.ts index 958066da98..57495c4843 100644 --- a/run/test/specs/group_message_link_preview.spec.ts +++ b/run/test/specs/group_message_link_preview.spec.ts @@ -3,17 +3,17 @@ import type { TestInfo } from '@playwright/test'; import { testLink } from '../../constants'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; -import { LinkPreview, LinkPreviewMessage } from './locators'; +import { LinkPreview, LinkPreviewMessage } from '../locators'; import { MessageBody, MessageInput, OutgoingMessageStatusSent, SendButton, -} from './locators/conversation'; -import { EnableLinkPreviewsModalButton } from './locators/global'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { EnableLinkPreviewsModalButton } from '../locators/global'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Send link to group', diff --git a/run/test/specs/group_message_long_text.spec.ts b/run/test/specs/group_message_long_text.spec.ts index 3f4b103da8..e286eda184 100644 --- a/run/test/specs/group_message_long_text.spec.ts +++ b/run/test/specs/group_message_long_text.spec.ts @@ -2,9 +2,9 @@ import type { TestInfo } from '@playwright/test'; import { longText } from '../../constants'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send long message to group', diff --git a/run/test/specs/group_message_unsend.spec.ts b/run/test/specs/group_message_unsend.spec.ts index 94da50cab8..426887bca3 100644 --- a/run/test/specs/group_message_unsend.spec.ts +++ b/run/test/specs/group_message_unsend.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { DeleteMessageConfirmationModal, DeleteMessageForEveryone } from './locators'; -import { DeletedMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { DeleteMessageConfirmationModal, DeleteMessageForEveryone } from '../locators'; +import { DeletedMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete message for all in group', diff --git a/run/test/specs/group_message_video.spec.ts b/run/test/specs/group_message_video.spec.ts index a284d39db4..eaa5641ee6 100644 --- a/run/test/specs/group_message_video.spec.ts +++ b/run/test/specs/group_message_video.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; -import { MediaMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MediaMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Send video to group', diff --git a/run/test/specs/group_message_voice.spec.ts b/run/test/specs/group_message_voice.spec.ts index ad66309fcb..028cd5ffdc 100644 --- a/run/test/specs/group_message_voice.spec.ts +++ b/run/test/specs/group_message_voice.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { MessageBody, VoiceMessage } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MessageBody, VoiceMessage } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send voice message to group', diff --git a/run/test/specs/group_reaction.spec.ts b/run/test/specs/group_reaction.spec.ts index 1c23df6643..38e5d47b44 100644 --- a/run/test/specs/group_reaction.spec.ts +++ b/run/test/specs/group_reaction.spec.ts @@ -8,9 +8,9 @@ import { EmojiReactsPill, FirstEmojiReact, MessageBody, -} from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send emoji react groups', diff --git a/run/test/specs/group_tests_add_contact.spec.ts b/run/test/specs/group_tests_add_contact.spec.ts index f8c8d43f6d..17d8ca6fec 100644 --- a/run/test/specs/group_tests_add_contact.spec.ts +++ b/run/test/specs/group_tests_add_contact.spec.ts @@ -3,16 +3,16 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { InviteContactsButton, InviteContactsMenuItem } from './locators'; -import { ConversationSettings } from './locators/conversation'; -import { Contact } from './locators/global'; -import { InviteContactConfirm, ManageMembersMenuItem } from './locators/groups'; -import { ConversationItem } from './locators/home'; -import { open_Alice1_Bob1_Charlie1_Unknown1 } from './state_builder'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { newContact } from './utils/create_contact'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { InviteContactsButton, InviteContactsMenuItem } from '../locators'; +import { ConversationSettings } from '../locators/conversation'; +import { Contact } from '../locators/global'; +import { InviteContactConfirm, ManageMembersMenuItem } from '../locators/groups'; +import { ConversationItem } from '../locators/home'; +import { open_Alice1_Bob1_Charlie1_Unknown1 } from '../state_builder'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { newContact } from '../utils/create_contact'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Add contact to group', diff --git a/run/test/specs/group_tests_change_group_description.spec.ts b/run/test/specs/group_tests_change_group_description.spec.ts index c1935ade9b..1a94481c04 100644 --- a/run/test/specs/group_tests_change_group_description.spec.ts +++ b/run/test/specs/group_tests_change_group_description.spec.ts @@ -6,17 +6,17 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; import { AccessibilityId } from '../../types/testing'; -import { ConversationSettings } from './locators/conversation'; +import { ConversationSettings } from '../locators/conversation'; import { EditGroupDescriptionInput, GroupDescription, SaveGroupNameChangeButton, UpdateGroupInformation, -} from './locators/groups'; -import { ErrorMessage } from './locators/onboarding'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/groups'; +import { ErrorMessage } from '../locators/onboarding'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Change group description', diff --git a/run/test/specs/group_tests_change_group_name.spec.ts b/run/test/specs/group_tests_change_group_name.spec.ts index 4fff33ee28..6a112f3691 100644 --- a/run/test/specs/group_tests_change_group_name.spec.ts +++ b/run/test/specs/group_tests_change_group_name.spec.ts @@ -2,15 +2,15 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; -import { ConversationSettings } from './locators/conversation'; +import { ConversationSettings } from '../locators/conversation'; import { EditGroupNameInput, SaveGroupNameChangeButton, UpdateGroupInformation, -} from './locators/groups'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/groups'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Change group name', diff --git a/run/test/specs/group_tests_create_group.spec.ts b/run/test/specs/group_tests_create_group.spec.ts index 440f797cb7..de32d5af82 100644 --- a/run/test/specs/group_tests_create_group.spec.ts +++ b/run/test/specs/group_tests_create_group.spec.ts @@ -2,9 +2,9 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { newUser } from './utils/create_account'; -import { createGroup } from './utils/create_group'; -import { closeApp, openAppThreeDevices, SupportedPlatformsType } from './utils/open_app'; +import { newUser } from '../utils/create_account'; +import { createGroup } from '../utils/create_group'; +import { closeApp, openAppThreeDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Create group', diff --git a/run/test/specs/group_tests_create_group_banner.spec.ts b/run/test/specs/group_tests_create_group_banner.spec.ts index a5f57c4a8b..9d842c8a70 100644 --- a/run/test/specs/group_tests_create_group_banner.spec.ts +++ b/run/test/specs/group_tests_create_group_banner.spec.ts @@ -1,11 +1,11 @@ import type { TestInfo } from '@playwright/test'; import { androidIt } from '../../types/sessionIt'; -import { LatestReleaseBanner } from './locators/groups'; -import { PlusButton } from './locators/home'; -import { CreateGroupOption } from './locators/start_conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { LatestReleaseBanner } from '../locators/groups'; +import { PlusButton } from '../locators/home'; +import { CreateGroupOption } from '../locators/start_conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; // This banner no longer exists on iOS androidIt({ diff --git a/run/test/specs/group_tests_delete_group.spec.ts b/run/test/specs/group_tests_delete_group.spec.ts index 82358b90cd..1ec3ce4ec1 100644 --- a/run/test/specs/group_tests_delete_group.spec.ts +++ b/run/test/specs/group_tests_delete_group.spec.ts @@ -3,11 +3,11 @@ import { test, type TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { ConversationSettings } from './locators/conversation'; -import { DeleteGroupConfirm, DeleteGroupMenuItem } from './locators/groups'; -import { ConversationItem, PlusButton } from './locators/home'; -import { open_Alice2_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { ConversationSettings } from '../locators/conversation'; +import { DeleteGroupConfirm, DeleteGroupMenuItem } from '../locators/groups'; +import { ConversationItem, PlusButton } from '../locators/home'; +import { open_Alice2_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete group linked device', diff --git a/run/test/specs/group_tests_edit_group_banner.spec.ts b/run/test/specs/group_tests_edit_group_banner.spec.ts index 0e9d55c69e..25b295f954 100644 --- a/run/test/specs/group_tests_edit_group_banner.spec.ts +++ b/run/test/specs/group_tests_edit_group_banner.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { androidIt } from '../../types/sessionIt'; -import { ConversationSettings } from './locators/conversation'; -import { LatestReleaseBanner, ManageMembersMenuItem } from './locators/groups'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { ConversationSettings } from '../locators/conversation'; +import { LatestReleaseBanner, ManageMembersMenuItem } from '../locators/groups'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; // This banner no longer exists on iOS androidIt({ diff --git a/run/test/specs/group_tests_invite_contact_banner.spec.ts b/run/test/specs/group_tests_invite_contact_banner.spec.ts index a6bd351e45..0ca8c68418 100644 --- a/run/test/specs/group_tests_invite_contact_banner.spec.ts +++ b/run/test/specs/group_tests_invite_contact_banner.spec.ts @@ -1,11 +1,11 @@ import type { TestInfo } from '@playwright/test'; import { androidIt } from '../../types/sessionIt'; -import { InviteContactsButton } from './locators'; -import { ConversationSettings } from './locators/conversation'; -import { LatestReleaseBanner, ManageMembersMenuItem } from './locators/groups'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { InviteContactsButton } from '../locators'; +import { ConversationSettings } from '../locators/conversation'; +import { LatestReleaseBanner, ManageMembersMenuItem } from '../locators/groups'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; // This banner no longer exists on iOS androidIt({ diff --git a/run/test/specs/group_tests_kick_member.spec.ts b/run/test/specs/group_tests_kick_member.spec.ts index f2d232aa76..6c70746704 100644 --- a/run/test/specs/group_tests_kick_member.spec.ts +++ b/run/test/specs/group_tests_kick_member.spec.ts @@ -3,15 +3,15 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ConversationSettings, MessageInput } from './locators/conversation'; +import { ConversationSettings, MessageInput } from '../locators/conversation'; import { ConfirmRemovalButton, GroupMember, ManageMembersMenuItem, RemoveMemberButton, -} from './locators/groups'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { SupportedPlatformsType } from './utils/open_app'; +} from '../locators/groups'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Kick member', diff --git a/run/test/specs/group_tests_leave_group.spec.ts b/run/test/specs/group_tests_leave_group.spec.ts index c71bd93c49..bbe1e5ca55 100644 --- a/run/test/specs/group_tests_leave_group.spec.ts +++ b/run/test/specs/group_tests_leave_group.spec.ts @@ -2,12 +2,12 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { ConversationSettings } from './locators/conversation'; -import { LeaveGroupConfirm, LeaveGroupMenuItem } from './locators/groups'; -import { ConversationItem } from './locators/home'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { sleepFor } from './utils/index'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { ConversationSettings } from '../locators/conversation'; +import { LeaveGroupConfirm, LeaveGroupMenuItem } from '../locators/groups'; +import { ConversationItem } from '../locators/home'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { sleepFor } from '../utils/index'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Leave group', diff --git a/run/test/specs/group_tests_mentions.spec.ts b/run/test/specs/group_tests_mentions.spec.ts index d64013d3da..3563c8557a 100644 --- a/run/test/specs/group_tests_mentions.spec.ts +++ b/run/test/specs/group_tests_mentions.spec.ts @@ -1,9 +1,9 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_Charlie1_friends_group } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Mentions for groups', diff --git a/run/test/specs/invite_a_friend_share.spec.ts b/run/test/specs/invite_a_friend_share.spec.ts index a1afa55d00..20a20bc704 100644 --- a/run/test/specs/invite_a_friend_share.spec.ts +++ b/run/test/specs/invite_a_friend_share.spec.ts @@ -3,11 +3,11 @@ import type { TestInfo } from '@playwright/test'; import { IOS_XPATHS } from '../../constants'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { AccountIDDisplay } from './locators/global'; -import { PlusButton } from './locators/home'; -import { InviteAFriendOption, ShareButton } from './locators/start_conversation'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +import { AccountIDDisplay } from '../locators/global'; +import { PlusButton } from '../locators/home'; +import { InviteAFriendOption, ShareButton } from '../locators/start_conversation'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Invite a friend', diff --git a/run/test/specs/landing_page_new_account.spec.ts b/run/test/specs/landing_page_new_account.spec.ts index 90970f1a3c..e057e40785 100644 --- a/run/test/specs/landing_page_new_account.spec.ts +++ b/run/test/specs/landing_page_new_account.spec.ts @@ -2,9 +2,9 @@ import { type TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { verifyPageScreenshot } from './utils/verify_screenshots'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { verifyPageScreenshot } from '../utils/verify_screenshots'; bothPlatformsIt({ title: 'Check landing page (new account) layout', diff --git a/run/test/specs/landing_page_restore_account.spec.ts b/run/test/specs/landing_page_restore_account.spec.ts index d7d9883346..1064e97104 100644 --- a/run/test/specs/landing_page_restore_account.spec.ts +++ b/run/test/specs/landing_page_restore_account.spec.ts @@ -3,9 +3,9 @@ import type { TestInfo } from '@playwright/test'; import { USERNAME } from '@session-foundation/qa-seeder'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { linkedDevice } from './utils/link_device'; -import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app'; -import { verifyPageScreenshot } from './utils/verify_screenshots'; +import { linkedDevice } from '../utils/link_device'; +import { closeApp, openAppTwoDevices, SupportedPlatformsType } from '../utils/open_app'; +import { verifyPageScreenshot } from '../utils/verify_screenshots'; bothPlatformsIt({ title: 'Check landing page (restored account) layout', diff --git a/run/test/specs/linked_device.spec.ts b/run/test/specs/linked_device.spec.ts index 03983bc4eb..27c5936253 100644 --- a/run/test/specs/linked_device.spec.ts +++ b/run/test/specs/linked_device.spec.ts @@ -3,11 +3,11 @@ import type { TestInfo } from '@playwright/test'; import { USERNAME } from '@session-foundation/qa-seeder'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { UsernameDisplay } from './locators'; -import { AccountIDDisplay } from './locators/global'; -import { UserSettings } from './locators/settings'; -import { linkedDevice } from './utils/link_device'; -import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app'; +import { UsernameDisplay } from '../locators'; +import { AccountIDDisplay } from '../locators/global'; +import { UserSettings } from '../locators/settings'; +import { linkedDevice } from '../utils/link_device'; +import { closeApp, openAppTwoDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Link device', diff --git a/run/test/specs/linked_device_avatar_color.spec.ts b/run/test/specs/linked_device_avatar_color.spec.ts index cd411b3400..cdfee90e2d 100644 --- a/run/test/specs/linked_device_avatar_color.spec.ts +++ b/run/test/specs/linked_device_avatar_color.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { UserSettings } from './locators/settings'; -import { open_Alice2 } from './state_builder'; -import { isSameColor } from './utils/check_colour'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { UserSettings } from '../locators/settings'; +import { open_Alice2 } from '../state_builder'; +import { isSameColor } from '../utils/check_colour'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Avatar color linked device', diff --git a/run/test/specs/linked_device_block_user.spec.ts b/run/test/specs/linked_device_block_user.spec.ts index 39567fa951..900e0c8245 100644 --- a/run/test/specs/linked_device_block_user.spec.ts +++ b/run/test/specs/linked_device_block_user.spec.ts @@ -2,14 +2,14 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { BlockedContactsSettings, BlockUser, BlockUserConfirmationModal } from './locators'; -import { BlockedBanner, ConversationSettings } from './locators/conversation'; -import { Contact } from './locators/global'; -import { ConversationItem } from './locators/home'; -import { ConversationsMenuItem, UserSettings } from './locators/settings'; -import { open_Alice2_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { BlockedContactsSettings, BlockUser, BlockUserConfirmationModal } from '../locators'; +import { BlockedBanner, ConversationSettings } from '../locators/conversation'; +import { Contact } from '../locators/global'; +import { ConversationItem } from '../locators/home'; +import { ConversationsMenuItem, UserSettings } from '../locators/settings'; +import { open_Alice2_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Block user linked device', diff --git a/run/test/specs/linked_device_change_username.spec.ts b/run/test/specs/linked_device_change_username.spec.ts index 7193e883ff..6a5a80c7f8 100644 --- a/run/test/specs/linked_device_change_username.spec.ts +++ b/run/test/specs/linked_device_change_username.spec.ts @@ -1,11 +1,11 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { ClearInputButton, EditUsernameButton, UsernameDisplay, UsernameInput } from './locators'; -import { SaveNameChangeButton, UserSettings } from './locators/settings'; -import { open_Alice2 } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { ClearInputButton, EditUsernameButton, UsernameDisplay, UsernameInput } from '../locators'; +import { SaveNameChangeButton, UserSettings } from '../locators/settings'; +import { open_Alice2 } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Change username linked device', diff --git a/run/test/specs/linked_device_create_group.spec.ts b/run/test/specs/linked_device_create_group.spec.ts index 1eb8769495..19f23b3d8a 100644 --- a/run/test/specs/linked_device_create_group.spec.ts +++ b/run/test/specs/linked_device_create_group.spec.ts @@ -3,18 +3,18 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ConversationHeaderName, ConversationSettings } from './locators/conversation'; +import { ConversationHeaderName, ConversationSettings } from '../locators/conversation'; import { EditGroupNameInput, SaveGroupNameChangeButton, UpdateGroupInformation, -} from './locators/groups'; -import { ConversationItem } from './locators/home'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { createGroup } from './utils/create_group'; -import { linkedDevice } from './utils/link_device'; -import { closeApp, openAppFourDevices, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/groups'; +import { ConversationItem } from '../locators/home'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { createGroup } from '../utils/create_group'; +import { linkedDevice } from '../utils/link_device'; +import { closeApp, openAppFourDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Create group and change name syncs', diff --git a/run/test/specs/linked_device_delete_message.spec.ts b/run/test/specs/linked_device_delete_message.spec.ts index e91ee173b8..efb586cc66 100644 --- a/run/test/specs/linked_device_delete_message.spec.ts +++ b/run/test/specs/linked_device_delete_message.spec.ts @@ -2,11 +2,11 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { DeleteMessageConfirmationModal } from './locators'; -import { DeletedMessage, MessageBody } from './locators/conversation'; -import { ConversationItem } from './locators/home'; -import { open_Alice2_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { DeleteMessageConfirmationModal } from '../locators'; +import { DeletedMessage, MessageBody } from '../locators/conversation'; +import { ConversationItem } from '../locators/home'; +import { open_Alice2_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete message linked device', diff --git a/run/test/specs/linked_device_hide_note_to_self.spec.ts b/run/test/specs/linked_device_hide_note_to_self.spec.ts index b8ffea62fe..24381e4e4d 100644 --- a/run/test/specs/linked_device_hide_note_to_self.spec.ts +++ b/run/test/specs/linked_device_hide_note_to_self.spec.ts @@ -3,11 +3,11 @@ import { test, type TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { EmptyConversation, Hide } from './locators/conversation'; -import { CancelSearchButton, NoteToSelfOption } from './locators/global_search'; -import { ConversationItem, SearchButton } from './locators/home'; -import { open_Alice2 } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { EmptyConversation, Hide } from '../locators/conversation'; +import { CancelSearchButton, NoteToSelfOption } from '../locators/global_search'; +import { ConversationItem, SearchButton } from '../locators/home'; +import { open_Alice2 } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Hide note to self linked device', diff --git a/run/test/specs/linked_device_profile_picture_syncs.spec.ts b/run/test/specs/linked_device_profile_picture_syncs.spec.ts index d0247023b4..89d8a363aa 100644 --- a/run/test/specs/linked_device_profile_picture_syncs.spec.ts +++ b/run/test/specs/linked_device_profile_picture_syncs.spec.ts @@ -2,9 +2,9 @@ import { test, type TestInfo } from '@playwright/test'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { UserAvatar, UserSettings } from './locators/settings'; -import { open_Alice2 } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { UserAvatar, UserSettings } from '../locators/settings'; +import { open_Alice2 } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Change profile picture linked device', diff --git a/run/test/specs/linked_device_restore_group.spec.ts b/run/test/specs/linked_device_restore_group.spec.ts index 289e53d832..787bd8f661 100644 --- a/run/test/specs/linked_device_restore_group.spec.ts +++ b/run/test/specs/linked_device_restore_group.spec.ts @@ -2,12 +2,12 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ConversationHeaderName, MessageBody } from './locators/conversation'; -import { ConversationItem } from './locators/home'; -import { newUser } from './utils/create_account'; -import { createGroup } from './utils/create_group'; -import { closeApp, openAppFourDevices, SupportedPlatformsType } from './utils/open_app'; -import { restoreAccount } from './utils/restore_account'; +import { ConversationHeaderName, MessageBody } from '../locators/conversation'; +import { ConversationItem } from '../locators/home'; +import { newUser } from '../utils/create_account'; +import { createGroup } from '../utils/create_group'; +import { closeApp, openAppFourDevices, SupportedPlatformsType } from '../utils/open_app'; +import { restoreAccount } from '../utils/restore_account'; bothPlatformsIt({ title: 'Restore group', diff --git a/run/test/specs/linked_device_unsend_message.spec.ts b/run/test/specs/linked_device_unsend_message.spec.ts index 65dd06bddb..2aabc0ce19 100644 --- a/run/test/specs/linked_device_unsend_message.spec.ts +++ b/run/test/specs/linked_device_unsend_message.spec.ts @@ -3,11 +3,11 @@ import { test, type TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { DeleteMessageConfirmationModal, DeleteMessageForEveryone } from './locators'; -import { DeletedMessage, MessageBody } from './locators/conversation'; -import { ConversationItem, MessageSnippet } from './locators/home'; -import { open_Alice2_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { DeleteMessageConfirmationModal, DeleteMessageForEveryone } from '../locators'; +import { DeletedMessage, MessageBody } from '../locators/conversation'; +import { ConversationItem, MessageSnippet } from '../locators/home'; +import { open_Alice2_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Unsent message syncs', diff --git a/run/test/specs/linked_group_leave.spec.ts b/run/test/specs/linked_group_leave.spec.ts index 23e2da2fef..0d0c625145 100644 --- a/run/test/specs/linked_group_leave.spec.ts +++ b/run/test/specs/linked_group_leave.spec.ts @@ -3,14 +3,14 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ConversationSettings } from './locators/conversation'; -import { LeaveGroupConfirm, LeaveGroupMenuItem } from './locators/groups'; -import { ConversationItem } from './locators/home'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { createGroup } from './utils/create_group'; -import { linkedDevice } from './utils/link_device'; -import { closeApp, openAppFourDevices, SupportedPlatformsType } from './utils/open_app'; +import { ConversationSettings } from '../locators/conversation'; +import { LeaveGroupConfirm, LeaveGroupMenuItem } from '../locators/groups'; +import { ConversationItem } from '../locators/home'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { createGroup } from '../utils/create_group'; +import { linkedDevice } from '../utils/link_device'; +import { closeApp, openAppFourDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Leave group linked device', diff --git a/run/test/specs/message_check_performance.spec.ts b/run/test/specs/message_check_performance.spec.ts index 5212a48058..c26504f7f7 100644 --- a/run/test/specs/message_check_performance.spec.ts +++ b/run/test/specs/message_check_performance.spec.ts @@ -1,8 +1,8 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { SupportedPlatformsType } from './utils/open_app'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Check performance', diff --git a/run/test/specs/message_community_invitation.spec.ts b/run/test/specs/message_community_invitation.spec.ts index 940824c43a..2c042042a7 100644 --- a/run/test/specs/message_community_invitation.spec.ts +++ b/run/test/specs/message_community_invitation.spec.ts @@ -1,20 +1,20 @@ import type { TestInfo } from '@playwright/test'; +import { testCommunityLink, testCommunityName } from '../../constants/community'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { testCommunityLink, testCommunityName } from './../../constants/community'; -import { InviteContactsMenuItem, JoinCommunityModalButton } from './locators'; +import { InviteContactsMenuItem, JoinCommunityModalButton } from '../locators'; import { CommunityInvitation, CommunityInviteConfirmButton, ConversationSettings, -} from './locators/conversation'; -import { GroupMember } from './locators/groups'; -import { ConversationItem } from './locators/home'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { joinCommunity } from './utils/join_community'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { GroupMember } from '../locators/groups'; +import { ConversationItem } from '../locators/home'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { joinCommunity } from '../utils/join_community'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send community invitation', diff --git a/run/test/specs/message_deletion.spec.ts b/run/test/specs/message_deletion.spec.ts index f2d110729f..c177f1a44b 100644 --- a/run/test/specs/message_deletion.spec.ts +++ b/run/test/specs/message_deletion.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { DeleteMessageConfirmationModal, DeleteMessageLocally } from './locators'; -import { DeletedMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { DeleteMessageConfirmationModal, DeleteMessageLocally } from '../locators'; +import { DeletedMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete message locally', diff --git a/run/test/specs/message_document.spec.ts b/run/test/specs/message_document.spec.ts index 2d684a7edf..1579c742f4 100644 --- a/run/test/specs/message_document.spec.ts +++ b/run/test/specs/message_document.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { DocumentMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { DocumentMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send document 1:1', diff --git a/run/test/specs/message_gif.spec.ts b/run/test/specs/message_gif.spec.ts index 0c28a87e76..ae67c4a302 100644 --- a/run/test/specs/message_gif.spec.ts +++ b/run/test/specs/message_gif.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { MediaMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MediaMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send GIF 1:1', diff --git a/run/test/specs/message_image.spec.ts b/run/test/specs/message_image.spec.ts index 17eed7e092..3854685856 100644 --- a/run/test/specs/message_image.spec.ts +++ b/run/test/specs/message_image.spec.ts @@ -1,9 +1,9 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send image 1:1', diff --git a/run/test/specs/message_length.spec.ts b/run/test/specs/message_length.spec.ts index 4d4709a4fb..b04b27d0b0 100644 --- a/run/test/specs/message_length.spec.ts +++ b/run/test/specs/message_length.spec.ts @@ -10,11 +10,11 @@ import { MessageLengthCountdown, MessageLengthOkayButton, SendButton, -} from './locators/conversation'; -import { PlusButton } from './locators/home'; -import { EnterAccountID, NewMessageOption, NextButton } from './locators/start_conversation'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { PlusButton } from '../locators/home'; +import { EnterAccountID, NewMessageOption, NextButton } from '../locators/start_conversation'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; const maxChars = 2000; const countdownThreshold = 1800; diff --git a/run/test/specs/message_link_preview.spec.ts b/run/test/specs/message_link_preview.spec.ts index f5df4d3eb6..33bc8ced6b 100644 --- a/run/test/specs/message_link_preview.spec.ts +++ b/run/test/specs/message_link_preview.spec.ts @@ -3,17 +3,17 @@ import type { TestInfo } from '@playwright/test'; import { testLink } from '../../constants'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; -import { LinkPreview, LinkPreviewMessage } from './locators'; +import { LinkPreview, LinkPreviewMessage } from '../locators'; import { MessageBody, MessageInput, OutgoingMessageStatusSent, SendButton, -} from './locators/conversation'; -import { EnableLinkPreviewsModalButton } from './locators/global'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { EnableLinkPreviewsModalButton } from '../locators/global'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Send link 1:1', diff --git a/run/test/specs/message_long_text.spec.ts b/run/test/specs/message_long_text.spec.ts index 0e644a3fb8..5d09c2b8ce 100644 --- a/run/test/specs/message_long_text.spec.ts +++ b/run/test/specs/message_long_text.spec.ts @@ -7,11 +7,11 @@ import { MessageInput, OutgoingMessageStatusSent, SendButton, -} from './locators/conversation'; -import { ConversationItem } from './locators/home'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { ConversationItem } from '../locators/home'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Send long message 1:1', diff --git a/run/test/specs/message_reaction.spec.ts b/run/test/specs/message_reaction.spec.ts index 20f4b53994..85db6ce6f4 100644 --- a/run/test/specs/message_reaction.spec.ts +++ b/run/test/specs/message_reaction.spec.ts @@ -2,9 +2,9 @@ import { test, type TestInfo } from '@playwright/test'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { EmojiReactsPill, FirstEmojiReact, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { EmojiReactsPill, FirstEmojiReact, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send emoji react 1:1', diff --git a/run/test/specs/message_requests_accept.spec.ts b/run/test/specs/message_requests_accept.spec.ts index 3996c967bb..9d933fb492 100644 --- a/run/test/specs/message_requests_accept.spec.ts +++ b/run/test/specs/message_requests_accept.spec.ts @@ -3,10 +3,10 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ConversationItem, MessageRequestsBanner } from './locators/home'; -import { newUser } from './utils/create_account'; -import { linkedDevice } from './utils/link_device'; -import { closeApp, openAppThreeDevices, SupportedPlatformsType } from './utils/open_app'; +import { ConversationItem, MessageRequestsBanner } from '../locators/home'; +import { newUser } from '../utils/create_account'; +import { linkedDevice } from '../utils/link_device'; +import { closeApp, openAppThreeDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Accept message request', diff --git a/run/test/specs/message_requests_accept_text_reply.spec.ts b/run/test/specs/message_requests_accept_text_reply.spec.ts index 3a51aced93..36825d3afc 100644 --- a/run/test/specs/message_requests_accept_text_reply.spec.ts +++ b/run/test/specs/message_requests_accept_text_reply.spec.ts @@ -3,12 +3,12 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { MessageInput, OutgoingMessageStatusSent, SendButton } from './locators/conversation'; -import { PlusButton } from './locators/home'; -import { MessageRequestsBanner } from './locators/home'; -import { EnterAccountID, NewMessageOption, NextButton } from './locators/start_conversation'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app'; +import { MessageInput, OutgoingMessageStatusSent, SendButton } from '../locators/conversation'; +import { PlusButton } from '../locators/home'; +import { MessageRequestsBanner } from '../locators/home'; +import { EnterAccountID, NewMessageOption, NextButton } from '../locators/start_conversation'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppTwoDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Accept message request with text', diff --git a/run/test/specs/message_requests_block.spec.ts b/run/test/specs/message_requests_block.spec.ts index ef5c0978e1..04f0f9ac50 100644 --- a/run/test/specs/message_requests_block.spec.ts +++ b/run/test/specs/message_requests_block.spec.ts @@ -3,14 +3,14 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { type AccessibilityId, USERNAME } from '../../types/testing'; -import { BlockedContactsSettings } from './locators'; -import { Contact } from './locators/global'; -import { MessageRequestsBanner, PlusButton } from './locators/home'; -import { ConversationsMenuItem, UserSettings } from './locators/settings'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { linkedDevice } from './utils/link_device'; -import { closeApp, openAppThreeDevices, SupportedPlatformsType } from './utils/open_app'; +import { BlockedContactsSettings } from '../locators'; +import { Contact } from '../locators/global'; +import { MessageRequestsBanner, PlusButton } from '../locators/home'; +import { ConversationsMenuItem, UserSettings } from '../locators/settings'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { linkedDevice } from '../utils/link_device'; +import { closeApp, openAppThreeDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Block message request in conversation', diff --git a/run/test/specs/message_requests_clear_all.spec.ts b/run/test/specs/message_requests_clear_all.spec.ts index 989cc44068..dce65e4021 100644 --- a/run/test/specs/message_requests_clear_all.spec.ts +++ b/run/test/specs/message_requests_clear_all.spec.ts @@ -3,9 +3,9 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { type AccessibilityId, USERNAME } from '../../types/testing'; -import { MessageRequestsBanner } from './locators/home'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app'; +import { MessageRequestsBanner } from '../locators/home'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppTwoDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Message requests clear all', diff --git a/run/test/specs/message_requests_decline.spec.ts b/run/test/specs/message_requests_decline.spec.ts index 3c00f1a6d3..65078612fa 100644 --- a/run/test/specs/message_requests_decline.spec.ts +++ b/run/test/specs/message_requests_decline.spec.ts @@ -3,12 +3,12 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { type AccessibilityId, USERNAME } from '../../types/testing'; -import { DeclineMessageRequestButton, DeleteMesssageRequestConfirmation } from './locators'; -import { MessageRequestItem, MessageRequestsBanner, PlusButton } from './locators/home'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { linkedDevice } from './utils/link_device'; -import { closeApp, openAppThreeDevices, SupportedPlatformsType } from './utils/open_app'; +import { DeclineMessageRequestButton, DeleteMesssageRequestConfirmation } from '../locators'; +import { MessageRequestItem, MessageRequestsBanner, PlusButton } from '../locators/home'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { linkedDevice } from '../utils/link_device'; +import { closeApp, openAppThreeDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete message request in conversation', diff --git a/run/test/specs/message_requests_delete.spec.ts b/run/test/specs/message_requests_delete.spec.ts index 5f6d9d86f5..6657a57cac 100644 --- a/run/test/specs/message_requests_delete.spec.ts +++ b/run/test/specs/message_requests_delete.spec.ts @@ -3,10 +3,10 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { type AccessibilityId, USERNAME } from '../../types/testing'; -import { DeleteMessageRequestButton, DeleteMesssageRequestConfirmation } from './locators'; -import { MessageRequestItem, MessageRequestsBanner } from './locators/home'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app'; +import { DeleteMessageRequestButton, DeleteMesssageRequestConfirmation } from '../locators'; +import { MessageRequestItem, MessageRequestsBanner } from '../locators/home'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppTwoDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete message request in list', diff --git a/run/test/specs/message_unsend.spec.ts b/run/test/specs/message_unsend.spec.ts index eeeff8b571..92a4b3c5c9 100644 --- a/run/test/specs/message_unsend.spec.ts +++ b/run/test/specs/message_unsend.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { DeleteMessageConfirmationModal, DeleteMessageForEveryone } from './locators'; -import { DeletedMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { DeleteMessageConfirmationModal, DeleteMessageForEveryone } from '../locators'; +import { DeletedMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Unsend message', diff --git a/run/test/specs/message_video.spec.ts b/run/test/specs/message_video.spec.ts index 191943cbca..469e8414b8 100644 --- a/run/test/specs/message_video.spec.ts +++ b/run/test/specs/message_video.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; -import { MediaMessage, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MediaMessage, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Send video 1:1', diff --git a/run/test/specs/message_voice.spec.ts b/run/test/specs/message_voice.spec.ts index 8b104972b6..e5802e79de 100644 --- a/run/test/specs/message_voice.spec.ts +++ b/run/test/specs/message_voice.spec.ts @@ -1,10 +1,10 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { MessageBody, VoiceMessage } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MessageBody, VoiceMessage } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Send voice message 1:1', diff --git a/run/test/specs/network_page_link_network.spec.ts b/run/test/specs/network_page_link_network.spec.ts index b70b188a7b..ef4c162b7d 100644 --- a/run/test/specs/network_page_link_network.spec.ts +++ b/run/test/specs/network_page_link_network.spec.ts @@ -3,17 +3,17 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { SafariAddressBar, URLInputField } from './locators/browsers'; +import { SafariAddressBar, URLInputField } from '../locators/browsers'; import { OpenLinkButton, SessionNetworkLearnMoreNetwork, SessionNetworkMenuItem, -} from './locators/network_page'; -import { UserSettings } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { handleChromeFirstTimeOpen } from './utils/handle_first_open'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { assertUrlIsReachable, ensureHttpsURL } from './utils/utilities'; +} from '../locators/network_page'; +import { UserSettings } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { handleChromeFirstTimeOpen } from '../utils/handle_first_open'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { assertUrlIsReachable, ensureHttpsURL } from '../utils/utilities'; bothPlatformsIt({ title: 'Network page learn more network link', diff --git a/run/test/specs/network_page_link_staking.spec.ts b/run/test/specs/network_page_link_staking.spec.ts index cce4e558c8..aa7e574595 100644 --- a/run/test/specs/network_page_link_staking.spec.ts +++ b/run/test/specs/network_page_link_staking.spec.ts @@ -3,17 +3,17 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { SafariAddressBar, URLInputField } from './locators/browsers'; +import { SafariAddressBar, URLInputField } from '../locators/browsers'; import { OpenLinkButton, SessionNetworkLearnMoreStaking, SessionNetworkMenuItem, -} from './locators/network_page'; -import { UserSettings } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { handleChromeFirstTimeOpen } from './utils/handle_first_open'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { assertUrlIsReachable, ensureHttpsURL } from './utils/utilities'; +} from '../locators/network_page'; +import { UserSettings } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { handleChromeFirstTimeOpen } from '../utils/handle_first_open'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { assertUrlIsReachable, ensureHttpsURL } from '../utils/utilities'; bothPlatformsIt({ title: 'Network page learn more staking link', diff --git a/run/test/specs/network_page_refresh_page.spec.ts b/run/test/specs/network_page_refresh_page.spec.ts index f8c4ca667b..64c2173ec2 100644 --- a/run/test/specs/network_page_refresh_page.spec.ts +++ b/run/test/specs/network_page_refresh_page.spec.ts @@ -2,11 +2,11 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { LastUpdatedTimeStamp, SessionNetworkMenuItem } from './locators/network_page'; -import { UserSettings } from './locators/settings'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +import { LastUpdatedTimeStamp, SessionNetworkMenuItem } from '../locators/network_page'; +import { UserSettings } from '../locators/settings'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Network page refresh', diff --git a/run/test/specs/network_page_values.spec.ts b/run/test/specs/network_page_values.spec.ts index e8558cb5c7..61643ff9ba 100644 --- a/run/test/specs/network_page_values.spec.ts +++ b/run/test/specs/network_page_values.spec.ts @@ -8,11 +8,11 @@ import { SESHPrice, SessionNetworkMenuItem, StakingRewardPoolAmount, -} from './locators/network_page'; -import { UserSettings } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { validateNetworkData } from './utils/network_api'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/network_page'; +import { UserSettings } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { validateNetworkData } from '../utils/network_api'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Network page values', diff --git a/run/test/specs/input_validations/onboarding_incorrect_seed.spec.ts b/run/test/specs/onboarding_incorrect_seed.spec.ts similarity index 94% rename from run/test/specs/input_validations/onboarding_incorrect_seed.spec.ts rename to run/test/specs/onboarding_incorrect_seed.spec.ts index 092cbec052..a6b3b982a9 100644 --- a/run/test/specs/input_validations/onboarding_incorrect_seed.spec.ts +++ b/run/test/specs/onboarding_incorrect_seed.spec.ts @@ -1,7 +1,7 @@ import type { TestInfo } from '@playwright/test'; -import { tStripped } from '../../../localizer/lib'; -import { bothPlatformsIt } from '../../../types/sessionIt'; +import { tStripped } from '../../localizer/lib'; +import { bothPlatformsIt } from '../../types/sessionIt'; import { ContinueButton } from '../locators/global'; import { AccountRestoreButton, ErrorMessage, SeedPhraseInput } from '../locators/onboarding'; import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; diff --git a/run/test/specs/input_validations/onboarding_long_name.spec.ts b/run/test/specs/onboarding_long_name.spec.ts similarity index 95% rename from run/test/specs/input_validations/onboarding_long_name.spec.ts rename to run/test/specs/onboarding_long_name.spec.ts index 3fdebee435..b362df9e46 100644 --- a/run/test/specs/input_validations/onboarding_long_name.spec.ts +++ b/run/test/specs/onboarding_long_name.spec.ts @@ -1,7 +1,7 @@ import type { TestInfo } from '@playwright/test'; -import { tStripped } from '../../../localizer/lib'; -import { bothPlatformsIt } from '../../../types/sessionIt'; +import { tStripped } from '../../localizer/lib'; +import { bothPlatformsIt } from '../../types/sessionIt'; import { ContinueButton } from '../locators/global'; import { CreateAccountButton, DisplayNameInput, ErrorMessage } from '../locators/onboarding'; import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; diff --git a/run/test/specs/input_validations/onboarding_no_name.spec.ts b/run/test/specs/onboarding_no_name.spec.ts similarity index 94% rename from run/test/specs/input_validations/onboarding_no_name.spec.ts rename to run/test/specs/onboarding_no_name.spec.ts index 0eac2587b9..96b02082c5 100644 --- a/run/test/specs/input_validations/onboarding_no_name.spec.ts +++ b/run/test/specs/onboarding_no_name.spec.ts @@ -1,7 +1,7 @@ import type { TestInfo } from '@playwright/test'; -import { tStripped } from '../../../localizer/lib'; -import { bothPlatformsIt } from '../../../types/sessionIt'; +import { tStripped } from '../../localizer/lib'; +import { bothPlatformsIt } from '../../types/sessionIt'; import { ContinueButton } from '../locators/global'; import { CreateAccountButton, DisplayNameInput, ErrorMessage } from '../locators/onboarding'; import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; diff --git a/run/test/specs/input_validations/onboarding_no_seed.spec.ts b/run/test/specs/onboarding_no_seed.spec.ts similarity index 94% rename from run/test/specs/input_validations/onboarding_no_seed.spec.ts rename to run/test/specs/onboarding_no_seed.spec.ts index dbc7c65424..2ce8f0b644 100644 --- a/run/test/specs/input_validations/onboarding_no_seed.spec.ts +++ b/run/test/specs/onboarding_no_seed.spec.ts @@ -1,7 +1,7 @@ import type { TestInfo } from '@playwright/test'; -import { tStripped } from '../../../localizer/lib'; -import { bothPlatformsIt } from '../../../types/sessionIt'; +import { tStripped } from '../../localizer/lib'; +import { bothPlatformsIt } from '../../types/sessionIt'; import { ContinueButton } from '../locators/global'; import { AccountRestoreButton, ErrorMessage, SeedPhraseInput } from '../locators/onboarding'; import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; diff --git a/run/test/specs/onboarding_pp.spec.ts b/run/test/specs/onboarding_pp.spec.ts index ba8192817d..9812fc4cf3 100644 --- a/run/test/specs/onboarding_pp.spec.ts +++ b/run/test/specs/onboarding_pp.spec.ts @@ -1,11 +1,11 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { SafariAddressBar, URLInputField } from './locators/browsers'; -import { PrivacyPolicyButton, SplashScreenLinks } from './locators/onboarding'; -import { handleChromeFirstTimeOpen } from './utils/handle_first_open'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { assertUrlIsReachable, ensureHttpsURL } from './utils/utilities'; +import { SafariAddressBar, URLInputField } from '../locators/browsers'; +import { PrivacyPolicyButton, SplashScreenLinks } from '../locators/onboarding'; +import { handleChromeFirstTimeOpen } from '../utils/handle_first_open'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { assertUrlIsReachable, ensureHttpsURL } from '../utils/utilities'; bothPlatformsIt({ title: 'Onboarding privacy policy', diff --git a/run/test/specs/onboarding_tos.spec.ts b/run/test/specs/onboarding_tos.spec.ts index 37ba46013d..933b78a47d 100644 --- a/run/test/specs/onboarding_tos.spec.ts +++ b/run/test/specs/onboarding_tos.spec.ts @@ -1,11 +1,11 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { SafariAddressBar, URLInputField } from './locators/browsers'; -import { SplashScreenLinks, TermsOfServiceButton } from './locators/onboarding'; -import { handleChromeFirstTimeOpen } from './utils/handle_first_open'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { assertUrlIsReachable, ensureHttpsURL } from './utils/utilities'; +import { SafariAddressBar, URLInputField } from '../locators/browsers'; +import { SplashScreenLinks, TermsOfServiceButton } from '../locators/onboarding'; +import { handleChromeFirstTimeOpen } from '../utils/handle_first_open'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { assertUrlIsReachable, ensureHttpsURL } from '../utils/utilities'; bothPlatformsIt({ title: 'Onboarding terms of service', diff --git a/run/test/specs/input_validations/onboarding_wrong_seed.spec.ts b/run/test/specs/onboarding_wrong_seed.spec.ts similarity index 94% rename from run/test/specs/input_validations/onboarding_wrong_seed.spec.ts rename to run/test/specs/onboarding_wrong_seed.spec.ts index 5cdf76a63f..001266f06f 100644 --- a/run/test/specs/input_validations/onboarding_wrong_seed.spec.ts +++ b/run/test/specs/onboarding_wrong_seed.spec.ts @@ -1,7 +1,7 @@ import type { TestInfo } from '@playwright/test'; -import { tStripped } from '../../../localizer/lib'; -import { bothPlatformsIt } from '../../../types/sessionIt'; +import { tStripped } from '../../localizer/lib'; +import { bothPlatformsIt } from '../../types/sessionIt'; import { ContinueButton } from '../locators/global'; import { AccountRestoreButton, ErrorMessage, SeedPhraseInput } from '../locators/onboarding'; import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; diff --git a/run/test/specs/ons_resolve.spec.ts b/run/test/specs/ons_resolve.spec.ts index b22edcb2b5..16ec3d18b3 100644 --- a/run/test/specs/ons_resolve.spec.ts +++ b/run/test/specs/ons_resolve.spec.ts @@ -4,12 +4,12 @@ import { ONS_MAPPINGS } from '../../constants'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ConversationHeaderName } from './locators/conversation'; -import { PlusButton } from './locators/home'; -import { EnterAccountID, NewMessageOption, NextButton } from './locators/start_conversation'; -import { newUser } from './utils/create_account'; -import { truncatePubkey } from './utils/get_account_id'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +import { ConversationHeaderName } from '../locators/conversation'; +import { PlusButton } from '../locators/home'; +import { EnterAccountID, NewMessageOption, NextButton } from '../locators/start_conversation'; +import { newUser } from '../utils/create_account'; +import { truncatePubkey } from '../utils/get_account_id'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'ONS resolution', diff --git a/run/test/specs/review_negative.spec.ts b/run/test/specs/review_negative.spec.ts index f8119dc647..91364f2648 100644 --- a/run/test/specs/review_negative.spec.ts +++ b/run/test/specs/review_negative.spec.ts @@ -8,11 +8,11 @@ import { ReviewPromptNeedsWorkButton, ReviewPromptNotNowButton, ReviewPromptOpenSurveyButton, -} from './locators/home'; -import { PathMenuItem } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { assertUrlIsReachable } from './utils/utilities'; +} from '../locators/home'; +import { PathMenuItem } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { assertUrlIsReachable } from '../utils/utilities'; bothPlatformsIt({ title: 'Review prompt negative flow', diff --git a/run/test/specs/review_once.spec.ts b/run/test/specs/review_once.spec.ts index 966473a218..584286a2a6 100644 --- a/run/test/specs/review_once.spec.ts +++ b/run/test/specs/review_once.spec.ts @@ -4,12 +4,12 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { CloseSettings } from './locators'; -import { ModalHeading } from './locators/global'; -import { PlusButton } from './locators/home'; -import { PathMenuItem, UserSettings } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +import { CloseSettings } from '../locators'; +import { ModalHeading } from '../locators/global'; +import { PlusButton } from '../locators/home'; +import { PathMenuItem, UserSettings } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Review prompt only once', diff --git a/run/test/specs/review_positive.spec.ts b/run/test/specs/review_positive.spec.ts index 6fd6695e6e..86a8ff2687 100644 --- a/run/test/specs/review_positive.spec.ts +++ b/run/test/specs/review_positive.spec.ts @@ -8,10 +8,10 @@ import { ReviewPromptItsGreatButton, ReviewPromptNotNowButton, ReviewPromptRateAppButton, -} from './locators/home'; -import { PathMenuItem, UserSettings } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/home'; +import { PathMenuItem, UserSettings } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Review prompt positive flow', diff --git a/run/test/specs/review_triggers.spec.ts b/run/test/specs/review_triggers.spec.ts index a56116db40..884e6b53c9 100644 --- a/run/test/specs/review_triggers.spec.ts +++ b/run/test/specs/review_triggers.spec.ts @@ -5,16 +5,16 @@ import { TestSteps } from '../../types/allure'; import { DeviceWrapper } from '../../types/DeviceWrapper'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { CopyURLButton } from './locators/global'; +import { CopyURLButton } from '../locators/global'; import { AppearanceMenuItem, ClassicLightThemeOption, DonationsMenuItem, PathMenuItem, UserSettings, -} from './locators/settings'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; // Yes, multiple tests in one file! const reviewTriggers = [ diff --git a/run/test/specs/upm_homescreen.spec.ts b/run/test/specs/upm_homescreen.spec.ts index ce36da7b50..1ef5c7ee65 100644 --- a/run/test/specs/upm_homescreen.spec.ts +++ b/run/test/specs/upm_homescreen.spec.ts @@ -2,9 +2,9 @@ import { test, type TestInfo } from '@playwright/test'; import { TestSteps } from '../../types/allure'; import { androidIt } from '../../types/sessionIt'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { verifyPageScreenshot } from './utils/verify_screenshots'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { verifyPageScreenshot } from '../utils/verify_screenshots'; androidIt({ title: 'User Profile Modal Home Screen', diff --git a/run/test/specs/user_actions_block_conversation_list.spec.ts b/run/test/specs/user_actions_block_conversation_list.spec.ts index e49f1678c7..0595637c70 100644 --- a/run/test/specs/user_actions_block_conversation_list.spec.ts +++ b/run/test/specs/user_actions_block_conversation_list.spec.ts @@ -3,12 +3,12 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { androidIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { BlockedContactsSettings } from './locators'; -import { Contact } from './locators/global'; -import { ConversationItem, LongPressBlockOption } from './locators/home'; -import { ConversationsMenuItem, UserSettings } from './locators/settings'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { BlockedContactsSettings } from '../locators'; +import { Contact } from '../locators/global'; +import { ConversationItem, LongPressBlockOption } from '../locators/home'; +import { ConversationsMenuItem, UserSettings } from '../locators/settings'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; // Block option no longer available on iOS in conversation list androidIt({ diff --git a/run/test/specs/user_actions_block_conversation_options.spec.ts b/run/test/specs/user_actions_block_conversation_options.spec.ts index 68577fc742..41c17d851c 100644 --- a/run/test/specs/user_actions_block_conversation_options.spec.ts +++ b/run/test/specs/user_actions_block_conversation_options.spec.ts @@ -7,13 +7,13 @@ import { BlockUser, BlockUserConfirmationModal, CloseSettings, -} from './locators'; -import { BlockedBanner, ConversationSettings, MessageBody } from './locators/conversation'; -import { Contact } from './locators/global'; -import { ConversationsMenuItem, UserSettings } from './locators/settings'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators'; +import { BlockedBanner, ConversationSettings, MessageBody } from '../locators/conversation'; +import { Contact } from '../locators/global'; +import { ConversationsMenuItem, UserSettings } from '../locators/settings'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Block user in conversation settings', diff --git a/run/test/specs/user_actions_change_profile_picture.spec.ts b/run/test/specs/user_actions_change_profile_picture.spec.ts index 5c3ed7c590..cf3fefafac 100644 --- a/run/test/specs/user_actions_change_profile_picture.spec.ts +++ b/run/test/specs/user_actions_change_profile_picture.spec.ts @@ -3,9 +3,9 @@ import { test, type TestInfo } from '@playwright/test'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { UserAvatar } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +import { UserAvatar } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Change profile picture', diff --git a/run/test/specs/user_actions_change_username.spec.ts b/run/test/specs/user_actions_change_username.spec.ts index 10af4f7ee0..0a242b6288 100644 --- a/run/test/specs/user_actions_change_username.spec.ts +++ b/run/test/specs/user_actions_change_username.spec.ts @@ -3,10 +3,10 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ClearInputButton, EditUsernameButton, UsernameDisplay, UsernameInput } from './locators'; -import { SaveNameChangeButton, UserSettings } from './locators/settings'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +import { ClearInputButton, EditUsernameButton, UsernameDisplay, UsernameInput } from '../locators'; +import { SaveNameChangeButton, UserSettings } from '../locators/settings'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Change username', diff --git a/run/test/specs/user_actions_create_contact.spec.ts b/run/test/specs/user_actions_create_contact.spec.ts index 2fe2ccd015..cbca337c47 100644 --- a/run/test/specs/user_actions_create_contact.spec.ts +++ b/run/test/specs/user_actions_create_contact.spec.ts @@ -2,13 +2,13 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ConversationItem, MessageRequestsBanner } from './locators/home'; -import { newUser } from './utils/create_account'; -import { retryMsgSentForBanner } from './utils/create_contact'; -import { linkedDevice } from './utils/link_device'; -import { closeApp, openAppThreeDevices, SupportedPlatformsType } from './utils/open_app'; -import { runOnlyOnIOS } from './utils/run_on'; -import { sleepFor } from './utils/sleep_for'; +import { ConversationItem, MessageRequestsBanner } from '../locators/home'; +import { newUser } from '../utils/create_account'; +import { retryMsgSentForBanner } from '../utils/create_contact'; +import { linkedDevice } from '../utils/link_device'; +import { closeApp, openAppThreeDevices, SupportedPlatformsType } from '../utils/open_app'; +import { runOnlyOnIOS } from '../utils/run_on'; +import { sleepFor } from '../utils/sleep_for'; bothPlatformsIt({ title: 'Create contact', diff --git a/run/test/specs/user_actions_create_user.spec.ts b/run/test/specs/user_actions_create_user.spec.ts index 24e119dd1c..a12ac645b8 100644 --- a/run/test/specs/user_actions_create_user.spec.ts +++ b/run/test/specs/user_actions_create_user.spec.ts @@ -2,8 +2,8 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Create user', diff --git a/run/test/specs/user_actions_delete_contact_ucs.spec.ts b/run/test/specs/user_actions_delete_contact_ucs.spec.ts index 477fb761bf..0cbeecfc95 100644 --- a/run/test/specs/user_actions_delete_contact_ucs.spec.ts +++ b/run/test/specs/user_actions_delete_contact_ucs.spec.ts @@ -9,10 +9,10 @@ import { DeleteContactConfirmButton, DeleteContactMenuItem, MessageBody, -} from './locators/conversation'; -import { ConversationItem, MessageRequestsBanner } from './locators/home'; -import { open_Alice2_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { ConversationItem, MessageRequestsBanner } from '../locators/home'; +import { open_Alice2_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete contact from conversation settings', diff --git a/run/test/specs/user_actions_delete_conversation.spec.ts b/run/test/specs/user_actions_delete_conversation.spec.ts index a1d9279bb8..85ee6878d1 100644 --- a/run/test/specs/user_actions_delete_conversation.spec.ts +++ b/run/test/specs/user_actions_delete_conversation.spec.ts @@ -4,9 +4,9 @@ import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ConversationItem } from './locators/home'; -import { open_Alice2_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { ConversationItem } from '../locators/home'; +import { open_Alice2_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete conversation from conversation list', diff --git a/run/test/specs/user_actions_delete_conversation_ucs.spec.ts b/run/test/specs/user_actions_delete_conversation_ucs.spec.ts index 27b8c33bd9..a9bec851f0 100644 --- a/run/test/specs/user_actions_delete_conversation_ucs.spec.ts +++ b/run/test/specs/user_actions_delete_conversation_ucs.spec.ts @@ -8,10 +8,10 @@ import { ConversationSettings, DeleteConversationMenuItem, DeleteConversationModalConfirm, -} from './locators/conversation'; -import { ConversationItem } from './locators/home'; -import { open_Alice2_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { ConversationItem } from '../locators/home'; +import { open_Alice2_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Delete conversation from conversation settings', diff --git a/run/test/specs/user_actions_hide_note_to_self.spec.ts b/run/test/specs/user_actions_hide_note_to_self.spec.ts index 5074814878..bfead470c4 100644 --- a/run/test/specs/user_actions_hide_note_to_self.spec.ts +++ b/run/test/specs/user_actions_hide_note_to_self.spec.ts @@ -11,12 +11,12 @@ import { HideNoteToSelfMenuOption, ShowNoteToSelfConfirmButton, ShowNoteToSelfMenuOption, -} from './locators/conversation'; -import { NoteToSelfOption } from './locators/global_search'; -import { CancelSearchButton } from './locators/global_search'; -import { ConversationItem, SearchButton } from './locators/home'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { NoteToSelfOption } from '../locators/global_search'; +import { CancelSearchButton } from '../locators/global_search'; +import { ConversationItem, SearchButton } from '../locators/home'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Hide note to self', diff --git a/run/test/specs/user_actions_hide_recovery_password.spec.ts b/run/test/specs/user_actions_hide_recovery_password.spec.ts index 207a86a484..5e04c5a897 100644 --- a/run/test/specs/user_actions_hide_recovery_password.spec.ts +++ b/run/test/specs/user_actions_hide_recovery_password.spec.ts @@ -3,15 +3,15 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { AccountIDDisplay, ContinueButton } from './locators/global'; +import { AccountIDDisplay, ContinueButton } from '../locators/global'; import { HideRecoveryPasswordButton, RecoveryPasswordMenuItem, UserSettings, YesButton, -} from './locators/settings'; -import { linkedDevice } from './utils/link_device'; -import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/settings'; +import { linkedDevice } from '../utils/link_device'; +import { closeApp, openAppTwoDevices, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Hide recovery password', diff --git a/run/test/specs/user_actions_read_status.spec.ts b/run/test/specs/user_actions_read_status.spec.ts index bac9194e36..19af73596a 100644 --- a/run/test/specs/user_actions_read_status.spec.ts +++ b/run/test/specs/user_actions_read_status.spec.ts @@ -1,11 +1,11 @@ import type { TestInfo } from '@playwright/test'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { MessageBody } from './locators/conversation'; -import { ConversationItem } from './locators/home'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils/index'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { MessageBody } from '../locators/conversation'; +import { ConversationItem } from '../locators/home'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils/index'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Read status', diff --git a/run/test/specs/user_actions_set_nickname.spec.ts b/run/test/specs/user_actions_set_nickname.spec.ts index 5be4bf0df6..4c84d5e0fd 100644 --- a/run/test/specs/user_actions_set_nickname.spec.ts +++ b/run/test/specs/user_actions_set_nickname.spec.ts @@ -11,10 +11,10 @@ import { NicknameInput, PreferredDisplayName, SaveNicknameButton, -} from './locators/conversation'; -import { ConversationItem } from './locators/home'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/conversation'; +import { ConversationItem } from '../locators/home'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Set nickname', diff --git a/run/test/specs/user_actions_share_to_session.spec.ts b/run/test/specs/user_actions_share_to_session.spec.ts index f2728ff908..952c18384e 100644 --- a/run/test/specs/user_actions_share_to_session.spec.ts +++ b/run/test/specs/user_actions_share_to_session.spec.ts @@ -4,14 +4,14 @@ import { testImage } from '../../constants/testfiles'; import { TestSteps } from '../../types/allure'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ImageName, ShareExtensionIcon } from './locators'; -import { MessageBody, MessageInput, SendButton } from './locators/conversation'; -import { PhotoLibrary } from './locators/external'; -import { Contact } from './locators/global'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { handlePhotosFirstTimeOpen } from './utils/handle_first_open'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { ImageName, ShareExtensionIcon } from '../locators'; +import { MessageBody, MessageInput, SendButton } from '../locators/conversation'; +import { PhotoLibrary } from '../locators/external'; +import { Contact } from '../locators/global'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { handlePhotosFirstTimeOpen } from '../utils/handle_first_open'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Share to session', diff --git a/run/test/specs/user_actions_unblock_user.spec.ts b/run/test/specs/user_actions_unblock_user.spec.ts index 5fca6edb9d..f5f14aef8a 100644 --- a/run/test/specs/user_actions_unblock_user.spec.ts +++ b/run/test/specs/user_actions_unblock_user.spec.ts @@ -2,10 +2,10 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { bothPlatformsIt } from '../../types/sessionIt'; -import { BlockUser, BlockUserConfirmationModal } from './locators'; -import { BlockedBanner, ConversationSettings, MessageBody } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { SupportedPlatformsType } from './utils/open_app'; +import { BlockUser, BlockUserConfirmationModal } from '../locators'; +import { BlockedBanner, ConversationSettings, MessageBody } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { SupportedPlatformsType } from '../utils/open_app'; bothPlatformsIt({ title: 'Unblock user', diff --git a/run/test/specs/visual_message_bubbles.spec.ts b/run/test/specs/visual_message_bubbles.spec.ts index 0a732d9b8a..9348fa9f87 100644 --- a/run/test/specs/visual_message_bubbles.spec.ts +++ b/run/test/specs/visual_message_bubbles.spec.ts @@ -7,11 +7,11 @@ import { MessageInput, OutgoingMessageStatusSent, SendButton, -} from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; -import { verifyPageScreenshot } from './utils/verify_screenshots'; +} from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; +import { verifyPageScreenshot } from '../utils/verify_screenshots'; bothPlatformsIt({ title: 'Check message bubble layout', diff --git a/run/test/specs/visual_settings.spec.ts b/run/test/specs/visual_settings.spec.ts index 7405071034..9050a88f90 100644 --- a/run/test/specs/visual_settings.spec.ts +++ b/run/test/specs/visual_settings.spec.ts @@ -4,17 +4,17 @@ import { TestSteps } from '../../types/allure'; import { DeviceWrapper } from '../../types/DeviceWrapper'; import { bothPlatformsIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { NotificationsMenuItem } from './locators/settings'; +import { NotificationsMenuItem } from '../locators/settings'; import { AppearanceMenuItem, ConversationsMenuItem, PrivacyMenuItem, UserSettings, -} from './locators/settings'; -import { sleepFor } from './utils'; -import { newUser } from './utils/create_account'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; -import { verifyPageScreenshot } from './utils/verify_screenshots'; +} from '../locators/settings'; +import { sleepFor } from '../utils'; +import { newUser } from '../utils/create_account'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; +import { verifyPageScreenshot } from '../utils/verify_screenshots'; const testCases = [ { diff --git a/run/test/specs/voice_calls.spec.ts b/run/test/specs/voice_calls.spec.ts index 2a149b1e4d..49925f26a5 100644 --- a/run/test/specs/voice_calls.spec.ts +++ b/run/test/specs/voice_calls.spec.ts @@ -3,11 +3,11 @@ import { test, type TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { TestSteps } from '../../types/allure'; import { bothPlatformsItSeparate } from '../../types/sessionIt'; -import { CloseSettings } from './locators'; -import { CallButton, NotificationsModalButton, NotificationSwitch } from './locators/conversation'; -import { open_Alice1_Bob1_friends } from './state_builder'; -import { sleepFor } from './utils/index'; -import { closeApp, SupportedPlatformsType } from './utils/open_app'; +import { CloseSettings } from '../locators'; +import { CallButton, NotificationsModalButton, NotificationSwitch } from '../locators/conversation'; +import { open_Alice1_Bob1_friends } from '../state_builder'; +import { sleepFor } from '../utils/index'; +import { closeApp, SupportedPlatformsType } from '../utils/open_app'; bothPlatformsItSeparate({ title: 'Voice calls', diff --git a/run/test/specs/warning_modal_new_account.spec.ts b/run/test/specs/warning_modal_new_account.spec.ts index a385a6a6fa..8c6055ab0e 100644 --- a/run/test/specs/warning_modal_new_account.spec.ts +++ b/run/test/specs/warning_modal_new_account.spec.ts @@ -3,15 +3,15 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { androidIt } from '../../types/sessionIt'; import { USERNAME } from '../../types/testing'; -import { ContinueButton } from '../specs/locators/global'; +import { ContinueButton } from '../locators/global'; import { BackButton, CreateAccountButton, DisplayNameInput, SlowModeRadio, WarningModalQuitButton, -} from './locators/onboarding'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/onboarding'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; // These modals no longer exist in groups rebuild for iOS androidIt({ diff --git a/run/test/specs/warning_modal_restore_account.spec.ts b/run/test/specs/warning_modal_restore_account.spec.ts index 48aca8748d..5092f402bf 100644 --- a/run/test/specs/warning_modal_restore_account.spec.ts +++ b/run/test/specs/warning_modal_restore_account.spec.ts @@ -2,15 +2,15 @@ import type { TestInfo } from '@playwright/test'; import { tStripped } from '../../localizer/lib'; import { androidIt } from '../../types/sessionIt'; -import { ContinueButton } from '../specs/locators/global'; +import { ContinueButton } from '../locators/global'; import { AccountRestoreButton, BackButton, SeedPhraseInput, SlowModeRadio, WarningModalQuitButton, -} from './locators/onboarding'; -import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from './utils/open_app'; +} from '../locators/onboarding'; +import { closeApp, openAppOnPlatformSingleDevice, SupportedPlatformsType } from '../utils/open_app'; // These modals no longer exist in groups rebuild for iOS androidIt({ title: 'Warning modal on restore account', diff --git a/run/test/specs/state_builder/index.ts b/run/test/state_builder/index.ts similarity index 99% rename from run/test/specs/state_builder/index.ts rename to run/test/state_builder/index.ts index 9944a20b5a..e448a90121 100644 --- a/run/test/specs/state_builder/index.ts +++ b/run/test/state_builder/index.ts @@ -13,7 +13,7 @@ import { type WithGroupStateKey, } from '@session-foundation/qa-seeder'; -import type { DeviceWrapper } from '../../../types/DeviceWrapper'; +import type { DeviceWrapper } from '../../types/DeviceWrapper'; import { ConversationItem } from '../locators/home'; import { getNetworkTarget } from '../utils/devnet'; diff --git a/run/test/specs/utils/allure/allureHelpers.ts b/run/test/utils/allure/allureHelpers.ts similarity index 98% rename from run/test/specs/utils/allure/allureHelpers.ts rename to run/test/utils/allure/allureHelpers.ts index eeabca5ad6..2cb1c4e5e7 100644 --- a/run/test/specs/utils/allure/allureHelpers.ts +++ b/run/test/utils/allure/allureHelpers.ts @@ -8,8 +8,8 @@ import { allureCurrentReportDir, allureResultsDir, GH_PAGES_BASE_URL, -} from '../../../../constants/allure'; -import { AllureSuiteConfig } from '../../../../types/allure'; +} from '../../../constants/allure'; +import { AllureSuiteConfig } from '../../../types/allure'; import { SupportedPlatformsType } from '../open_app'; export interface ReportContext { diff --git a/run/test/specs/utils/allure/closeRun.ts b/run/test/utils/allure/closeRun.ts similarity index 98% rename from run/test/specs/utils/allure/closeRun.ts rename to run/test/utils/allure/closeRun.ts index 8052c0cfcf..78907f915c 100644 --- a/run/test/specs/utils/allure/closeRun.ts +++ b/run/test/utils/allure/closeRun.ts @@ -1,7 +1,7 @@ import { exec } from 'child_process'; import fs from 'fs-extra'; -import { allureCurrentReportDir, allureResultsDir } from '../../../../constants/allure'; +import { allureCurrentReportDir, allureResultsDir } from '../../../constants/allure'; import { getReportContextFromEnv, writeEnvironmentProperties, diff --git a/run/test/specs/utils/allure/publishReport.ts b/run/test/utils/allure/publishReport.ts similarity index 98% rename from run/test/specs/utils/allure/publishReport.ts rename to run/test/utils/allure/publishReport.ts index 747ccb4d91..db6e941823 100644 --- a/run/test/specs/utils/allure/publishReport.ts +++ b/run/test/utils/allure/publishReport.ts @@ -2,7 +2,7 @@ import fs from 'fs-extra'; import ghpages from 'gh-pages'; import path from 'path'; -import { allureCurrentReportDir } from '../../../../constants/allure'; +import { allureCurrentReportDir } from '../../../constants/allure'; import { getReportContextFromEnv, patchFilesForLFSCDN, diff --git a/run/test/specs/utils/binaries.ts b/run/test/utils/binaries.ts similarity index 100% rename from run/test/specs/utils/binaries.ts rename to run/test/utils/binaries.ts diff --git a/run/test/specs/utils/capabilities_android.ts b/run/test/utils/capabilities_android.ts similarity index 100% rename from run/test/specs/utils/capabilities_android.ts rename to run/test/utils/capabilities_android.ts diff --git a/run/test/specs/utils/capabilities_ios.ts b/run/test/utils/capabilities_ios.ts similarity index 98% rename from run/test/specs/utils/capabilities_ios.ts rename to run/test/utils/capabilities_ios.ts index 4bc8379eef..27327478f3 100644 --- a/run/test/specs/utils/capabilities_ios.ts +++ b/run/test/utils/capabilities_ios.ts @@ -3,7 +3,7 @@ import { W3CXCUITestDriverCaps } from 'appium-xcuitest-driver/build/lib/driver'; import dotenv from 'dotenv'; import { existsSync, readFileSync } from 'fs'; -import { IntRange } from '../../../types/RangeType'; +import { IntRange } from '../../types/RangeType'; dotenv.config({ quiet: true }); diff --git a/run/test/specs/utils/check_colour.ts b/run/test/utils/check_colour.ts similarity index 100% rename from run/test/specs/utils/check_colour.ts rename to run/test/utils/check_colour.ts diff --git a/run/test/specs/utils/click_by_coordinates.ts b/run/test/utils/click_by_coordinates.ts similarity index 70% rename from run/test/specs/utils/click_by_coordinates.ts rename to run/test/utils/click_by_coordinates.ts index bbe2b94af2..707649b88d 100644 --- a/run/test/specs/utils/click_by_coordinates.ts +++ b/run/test/utils/click_by_coordinates.ts @@ -1,5 +1,5 @@ -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { Coordinates } from '../../../types/testing'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { Coordinates } from '../../types/testing'; import { sleepFor } from './sleep_for'; export const clickOnCoordinates = async (device: DeviceWrapper, coordinates: Coordinates) => { diff --git a/run/test/specs/utils/copy_file_to_simulator.ts b/run/test/utils/copy_file_to_simulator.ts similarity index 95% rename from run/test/specs/utils/copy_file_to_simulator.ts rename to run/test/utils/copy_file_to_simulator.ts index 8d2eb80a6a..c7618b9fec 100644 --- a/run/test/specs/utils/copy_file_to_simulator.ts +++ b/run/test/utils/copy_file_to_simulator.ts @@ -2,10 +2,10 @@ import { execSync } from 'child_process'; import * as fs from 'fs'; import * as path from 'path'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; const TARGET_GROUP_ID = 'group.com.apple.FileProvider.LocalStorage'; -const MEDIA_ROOT = path.join('run', 'test', 'specs', 'media'); +const MEDIA_ROOT = path.join('run', 'test', 'media'); /** * Utility for copying a file from the local 'media' directory to the current iOS simulator's diff --git a/run/test/specs/utils/create_account.ts b/run/test/utils/create_account.ts similarity index 96% rename from run/test/specs/utils/create_account.ts rename to run/test/utils/create_account.ts index 180acdbc16..37ffe96cab 100644 --- a/run/test/specs/utils/create_account.ts +++ b/run/test/utils/create_account.ts @@ -1,7 +1,7 @@ import type { UserNameType } from '@session-foundation/qa-seeder'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { User } from '../../../types/testing'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { User } from '../../types/testing'; import { CloseSettings } from '../locators'; import { AccountIDDisplay, ContinueButton } from '../locators/global'; import { CreateAccountButton, DisplayNameInput, FastModeRadio } from '../locators/onboarding'; diff --git a/run/test/specs/utils/create_contact.ts b/run/test/utils/create_contact.ts similarity index 95% rename from run/test/specs/utils/create_contact.ts rename to run/test/utils/create_contact.ts index 0731c7a04f..120be5392b 100644 --- a/run/test/specs/utils/create_contact.ts +++ b/run/test/utils/create_contact.ts @@ -1,6 +1,6 @@ import { runOnlyOnIOS, sleepFor } from '.'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { User } from '../../../types/testing'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { User } from '../../types/testing'; import { MessageBody } from '../locators/conversation'; import { MessageRequestsBanner } from '../locators/home'; import { SupportedPlatformsType } from './open_app'; diff --git a/run/test/specs/utils/create_group.ts b/run/test/utils/create_group.ts similarity index 95% rename from run/test/specs/utils/create_group.ts rename to run/test/utils/create_group.ts index 94fab6604a..cbf49f2491 100644 --- a/run/test/specs/utils/create_group.ts +++ b/run/test/utils/create_group.ts @@ -1,6 +1,6 @@ -import { tStripped } from '../../../localizer/lib'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { Group, GROUPNAME, User } from '../../../types/testing'; +import { tStripped } from '../../localizer/lib'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { Group, GROUPNAME, User } from '../../types/testing'; import { MessageBody } from '../locators/conversation'; import { Contact } from '../locators/global'; import { CreateGroupButton, GroupNameInput } from '../locators/groups'; diff --git a/run/test/specs/utils/devnet.ts b/run/test/utils/devnet.ts similarity index 97% rename from run/test/specs/utils/devnet.ts rename to run/test/utils/devnet.ts index 091023d105..d6fecd7ad3 100644 --- a/run/test/specs/utils/devnet.ts +++ b/run/test/utils/devnet.ts @@ -2,8 +2,8 @@ import { buildStateForTest } from '@session-foundation/qa-seeder'; import type { SupportedPlatformsType } from './open_app'; -import { DEVNET_URL } from '../../../constants'; -import { AppName } from '../../../types/testing'; +import { DEVNET_URL } from '../../constants'; +import { AppName } from '../../types/testing'; import { getAndroidApk } from './binaries'; import { sleepFor } from './sleep_for'; diff --git a/run/test/specs/utils/disappearing_control_messages.ts b/run/test/utils/disappearing_control_messages.ts similarity index 92% rename from run/test/specs/utils/disappearing_control_messages.ts rename to run/test/utils/disappearing_control_messages.ts index c3fb9a6948..db29c27023 100644 --- a/run/test/specs/utils/disappearing_control_messages.ts +++ b/run/test/utils/disappearing_control_messages.ts @@ -1,8 +1,8 @@ import type { UserNameType } from '@session-foundation/qa-seeder'; -import { tStripped } from '../../../localizer/lib'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { DisappearActions, DISAPPEARING_TIMES } from '../../../types/testing'; +import { tStripped } from '../../localizer/lib'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { DisappearActions, DISAPPEARING_TIMES } from '../../types/testing'; import { ConversationItem } from '../locators/home'; import { SupportedPlatformsType } from './open_app'; diff --git a/run/test/specs/utils/get_account_id.ts b/run/test/utils/get_account_id.ts similarity index 92% rename from run/test/specs/utils/get_account_id.ts rename to run/test/utils/get_account_id.ts index 4820217e21..64f104c8d6 100644 --- a/run/test/specs/utils/get_account_id.ts +++ b/run/test/utils/get_account_id.ts @@ -1,4 +1,4 @@ -import { User } from '../../../types/testing'; +import { User } from '../../types/testing'; import { SupportedPlatformsType } from './open_app'; export function sortByPubkey(...users: Array) { diff --git a/run/test/specs/utils/handle_first_open.ts b/run/test/utils/handle_first_open.ts similarity index 97% rename from run/test/specs/utils/handle_first_open.ts rename to run/test/utils/handle_first_open.ts index 5c6a79fbbb..59c1497db4 100644 --- a/run/test/specs/utils/handle_first_open.ts +++ b/run/test/utils/handle_first_open.ts @@ -1,4 +1,4 @@ -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; import { ChromeNotificationsNegativeButton, ChromeUseWithoutAnAccount } from '../locators/browsers'; import { iOSPhotosContinuebutton } from '../locators/external'; diff --git a/run/test/specs/utils/index.ts b/run/test/utils/index.ts similarity index 100% rename from run/test/specs/utils/index.ts rename to run/test/utils/index.ts diff --git a/run/test/specs/utils/join_community.ts b/run/test/utils/join_community.ts similarity index 93% rename from run/test/specs/utils/join_community.ts rename to run/test/utils/join_community.ts index 342d1d4a39..5a9faea85e 100644 --- a/run/test/specs/utils/join_community.ts +++ b/run/test/utils/join_community.ts @@ -1,4 +1,4 @@ -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; import { CommunityInput, JoinCommunityButton } from '../locators'; import { ConversationHeaderName, EmptyConversation } from '../locators/conversation'; import { PlusButton } from '../locators/home'; diff --git a/run/test/specs/utils/link_device.ts b/run/test/utils/link_device.ts similarity index 97% rename from run/test/specs/utils/link_device.ts rename to run/test/utils/link_device.ts index d9f755a748..3c94d7cd81 100644 --- a/run/test/specs/utils/link_device.ts +++ b/run/test/utils/link_device.ts @@ -1,7 +1,7 @@ import type { UserNameType } from '@session-foundation/qa-seeder'; import { sleepFor } from '.'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; import { ContinueButton } from '../locators/global'; import { PlusButton } from '../locators/home'; import { diff --git a/run/test/specs/utils/network_api.ts b/run/test/utils/network_api.ts similarity index 100% rename from run/test/specs/utils/network_api.ts rename to run/test/utils/network_api.ts diff --git a/run/test/specs/utils/open_app.ts b/run/test/utils/open_app.ts similarity index 99% rename from run/test/specs/utils/open_app.ts rename to run/test/utils/open_app.ts index 5099c18c37..f9f1d9b31a 100644 --- a/run/test/specs/utils/open_app.ts +++ b/run/test/utils/open_app.ts @@ -5,7 +5,7 @@ import { XCUITestDriverOpts } from 'appium-xcuitest-driver/build/lib/driver'; import { DriverOpts } from 'appium/build/lib/appium'; import { compact } from 'lodash'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; import { getAdbFullPath, getAndroidSystemImageToUse, diff --git a/run/test/specs/utils/permissions.ts b/run/test/utils/permissions.ts similarity index 97% rename from run/test/specs/utils/permissions.ts rename to run/test/utils/permissions.ts index a9b95c2a3f..4420b315c9 100644 --- a/run/test/specs/utils/permissions.ts +++ b/run/test/utils/permissions.ts @@ -5,7 +5,7 @@ import { XCUITestDriverOpts, } from 'appium-xcuitest-driver/build/lib/driver'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; import { AllowPermissionLocator, DenyPermissionLocator } from '../locators/global'; import { runScriptAndLog } from './utilities'; diff --git a/run/test/specs/utils/restore_account.ts b/run/test/utils/restore_account.ts similarity index 94% rename from run/test/specs/utils/restore_account.ts rename to run/test/utils/restore_account.ts index 289473bd54..d66f5a0472 100644 --- a/run/test/specs/utils/restore_account.ts +++ b/run/test/utils/restore_account.ts @@ -1,7 +1,7 @@ import { sleepFor } from '.'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { User } from '../../../types/testing'; -import { ContinueButton } from '../../specs/locators/global'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { User } from '../../types/testing'; +import { ContinueButton } from '../locators/global'; import { PlusButton } from '../locators/home'; import { AccountRestoreButton, diff --git a/run/test/specs/utils/run_on.ts b/run/test/utils/run_on.ts similarity index 100% rename from run/test/specs/utils/run_on.ts rename to run/test/utils/run_on.ts diff --git a/run/test/specs/utils/screenshot_helper.ts b/run/test/utils/screenshot_helper.ts similarity index 99% rename from run/test/specs/utils/screenshot_helper.ts rename to run/test/utils/screenshot_helper.ts index a44f4c7db0..9116ff257e 100644 --- a/run/test/specs/utils/screenshot_helper.ts +++ b/run/test/utils/screenshot_helper.ts @@ -4,7 +4,7 @@ import * as fs from 'fs'; import * as path from 'path'; import sharp from 'sharp'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; import { SupportedPlatformsType } from './open_app'; // Screenshot context type diff --git a/run/test/specs/utils/set_disappearing_messages.ts b/run/test/utils/set_disappearing_messages.ts similarity index 96% rename from run/test/specs/utils/set_disappearing_messages.ts rename to run/test/utils/set_disappearing_messages.ts index e4d5dbd22d..b35ad1b257 100644 --- a/run/test/specs/utils/set_disappearing_messages.ts +++ b/run/test/utils/set_disappearing_messages.ts @@ -1,5 +1,5 @@ -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { ConversationType, DISAPPEARING_TIMES, MergedOptions } from '../../../types/testing'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { ConversationType, DISAPPEARING_TIMES, MergedOptions } from '../../types/testing'; import { ConversationSettings } from '../locators/conversation'; import { DisappearingMessageRadial, diff --git a/run/test/specs/utils/sleep_for.ts b/run/test/utils/sleep_for.ts similarity index 100% rename from run/test/specs/utils/sleep_for.ts rename to run/test/utils/sleep_for.ts diff --git a/run/test/specs/utils/test_setup.ts b/run/test/utils/test_setup.ts similarity index 100% rename from run/test/specs/utils/test_setup.ts rename to run/test/utils/test_setup.ts diff --git a/run/test/specs/utils/time_travel.ts b/run/test/utils/time_travel.ts similarity index 100% rename from run/test/specs/utils/time_travel.ts rename to run/test/utils/time_travel.ts diff --git a/run/test/specs/utils/utilities.ts b/run/test/utils/utilities.ts similarity index 98% rename from run/test/specs/utils/utilities.ts rename to run/test/utils/utilities.ts index 0a33f13c09..e0461f1d70 100644 --- a/run/test/specs/utils/utilities.ts +++ b/run/test/utils/utilities.ts @@ -4,7 +4,7 @@ import { pick } from 'lodash'; import path from 'path'; import * as util from 'util'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; import { androidAppActivity, androidAppPackage } from './capabilities_android'; import { iOSBundleId } from './capabilities_ios'; import { sleepFor } from './sleep_for'; diff --git a/run/test/specs/utils/verify_screenshots.ts b/run/test/utils/verify_screenshots.ts similarity index 98% rename from run/test/specs/utils/verify_screenshots.ts rename to run/test/utils/verify_screenshots.ts index fd55916a4b..3267c72f26 100644 --- a/run/test/specs/utils/verify_screenshots.ts +++ b/run/test/utils/verify_screenshots.ts @@ -6,8 +6,8 @@ import sharp from 'sharp'; import { ssim } from 'ssim.js'; import { v4 as uuidv4 } from 'uuid'; -import { DeviceWrapper } from '../../../types/DeviceWrapper'; -import { ScreenshotFileNames } from '../../../types/testing'; +import { DeviceWrapper } from '../../types/DeviceWrapper'; +import { ScreenshotFileNames } from '../../types/testing'; import { SupportedPlatformsType } from './open_app'; import { getDiffDirectory } from './utilities'; import { clearStatusBarOverrides, setConsistentStatusBar } from './utilities'; diff --git a/run/types/DeviceWrapper.ts b/run/types/DeviceWrapper.ts index 4ea19f6333..c806b7c96c 100644 --- a/run/types/DeviceWrapper.ts +++ b/run/types/DeviceWrapper.ts @@ -22,7 +22,7 @@ import { ImagePermissionsModalAllow, LocatorsInterface, ReadReceiptsButton, -} from '../../run/test/specs/locators'; +} from '../../run/test/locators'; import { profilePicture, testFile, @@ -42,7 +42,7 @@ import { OutgoingMessageStatusSent, ScrollToBottomButton, SendButton, -} from '../test/specs/locators/conversation'; +} from '../test/locators/conversation'; import { Contact, CTABody, @@ -52,27 +52,23 @@ import { CTAHeading, ModalDescription, ModalHeading, -} from '../test/specs/locators/global'; -import { ConversationItem, PlusButton } from '../test/specs/locators/home'; -import { LoadingAnimation } from '../test/specs/locators/onboarding'; +} from '../test/locators/global'; +import { ConversationItem, PlusButton } from '../test/locators/home'; +import { LoadingAnimation } from '../test/locators/onboarding'; import { PrivacyMenuItem, SaveProfilePictureButton, UserAvatar, UserSettings, VersionNumber, -} from '../test/specs/locators/settings'; -import { - EnterAccountID, - NewMessageOption, - NextButton, -} from '../test/specs/locators/start_conversation'; -import { clickOnCoordinates, sleepFor } from '../test/specs/utils'; -import { getAdbFullPath } from '../test/specs/utils/binaries'; -import { parseDataImage } from '../test/specs/utils/check_colour'; -import { isSameColor } from '../test/specs/utils/check_colour'; -import { SupportedPlatformsType } from '../test/specs/utils/open_app'; -import { isDeviceAndroid, isDeviceIOS, runScriptAndLog } from '../test/specs/utils/utilities'; +} from '../test/locators/settings'; +import { EnterAccountID, NewMessageOption, NextButton } from '../test/locators/start_conversation'; +import { clickOnCoordinates, sleepFor } from '../test/utils'; +import { getAdbFullPath } from '../test/utils/binaries'; +import { parseDataImage } from '../test/utils/check_colour'; +import { isSameColor } from '../test/utils/check_colour'; +import { SupportedPlatformsType } from '../test/utils/open_app'; +import { isDeviceAndroid, isDeviceIOS, runScriptAndLog } from '../test/utils/utilities'; import { AccessibilityId, DISAPPEARING_TIMES, diff --git a/run/types/sessionIt.ts b/run/types/sessionIt.ts index afaa91488d..0b1be85bbd 100644 --- a/run/types/sessionIt.ts +++ b/run/types/sessionIt.ts @@ -2,15 +2,15 @@ import { test, type TestInfo } from '@playwright/test'; import { omit } from 'lodash'; -import type { AppCountPerTest } from '../test/specs/state_builder'; +import type { AppCountPerTest } from '../test/state_builder'; -import { setupAllureTestInfo } from '../test/specs/utils/allure/allureHelpers'; -import { getNetworkTarget } from '../test/specs/utils/devnet'; -import { SupportedPlatformsType } from '../test/specs/utils/open_app'; +import { setupAllureTestInfo } from '../test/utils/allure/allureHelpers'; +import { getNetworkTarget } from '../test/utils/devnet'; +import { SupportedPlatformsType } from '../test/utils/open_app'; import { captureScreenshotsOnFailure, unregisterDevicesForTest, -} from '../test/specs/utils/screenshot_helper'; +} from '../test/utils/screenshot_helper'; import { AllureSuiteConfig } from './allure'; import { TestRisk } from './testing'; diff --git a/scripts/cleanup_ios_simulators.ts b/scripts/cleanup_ios_simulators.ts index 3871cff973..f1f11f84c2 100644 --- a/scripts/cleanup_ios_simulators.ts +++ b/scripts/cleanup_ios_simulators.ts @@ -1,7 +1,7 @@ import { execSync } from 'child_process'; import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs'; -import type { Simulator } from '../run/test/specs/utils/capabilities_ios'; +import type { Simulator } from '../run/test/utils/capabilities_ios'; import { shutdownSimulator } from './ios_shared'; diff --git a/scripts/create_ios_simulators.ts b/scripts/create_ios_simulators.ts index 6f21fff773..5073b2323f 100644 --- a/scripts/create_ios_simulators.ts +++ b/scripts/create_ios_simulators.ts @@ -2,10 +2,10 @@ import { execSync } from 'child_process'; import { existsSync, readFileSync, writeFileSync } from 'fs'; import * as path from 'path'; -import type { Simulator } from '../run/test/specs/utils/capabilities_ios'; +import type { Simulator } from '../run/test/utils/capabilities_ios'; import type { DeviceWrapper } from '../run/types/DeviceWrapper'; -import { copyFileToSimulator } from '../run/test/specs/utils/copy_file_to_simulator'; +import { copyFileToSimulator } from '../run/test/utils/copy_file_to_simulator'; import { bootSimulator, isSimulatorBooted, shutdownSimulator } from './ios_shared'; import { sleepSync } from './shared';