refactor: only spec files in /specs

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

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;

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

run/test/specs/locators/conversation.ts → 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';
 

run/test/specs/locators/disappearing_messages.ts → 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 {

run/test/specs/locators/global.ts → 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 {

run/test/specs/locators/global_search.ts → 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 {

run/test/specs/locators/groups.ts → 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 {

run/test/specs/locators/home.ts → 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 {

run/test/specs/locators/index.ts → 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';
 

run/test/specs/locators/network_page.ts → 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;

run/test/specs/locators/onboarding.ts → 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 {

run/test/specs/locators/settings.ts → 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 {

run/test/specs/locators/start_conversation.ts → 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 {

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

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

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

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

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

run/test/specs/community_requests_on.spec.ts

@@ -4,21 +4,21 @@ 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,
   MessageBody,
   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',

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

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

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

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

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

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

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