chore: clean up

Author: Bilb

.github/workflows/android-regression.yml

@@ -1,10 +1,6 @@
 name: Android regression tests
 run-name: '${{ inputs.RISK }} regressions on: ${{ inputs.BRANCH_TO_CHECKOUT }} (${{ inputs.APPIUM_REPO }})'
 
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
 on:
   workflow_dispatch:
     inputs:

.github/workflows/ios-regression.yml

@@ -72,11 +72,6 @@ on:
           - '3'
         default: '3'
 
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-
 jobs:
   ios-regression:
     runs-on: [self-hosted, macOS]

README.md

@@ -81,7 +81,7 @@ yarn install --frozen # to install packages referenced from yarn.lock
 Then, choose an option:
 
 ```
-yarn build-and-test # Build typescript and run the tests
+yarn tsc # Build typescript files
 yarn run test # Run all the tests
 
 Platform specific

package.json

@@ -6,17 +6,15 @@
     "lint-check": "yarn prettier . --check && yarn eslint .",
     "tsc": "tsc",
     "tsc-watch": "tsc -w",
-    "test": "npx playwright test --timeout 300000 ./run/test/specs/*.spec.ts --grep ",
-    "test-no-retry": "_TESTING=1 npx playwright test --timeout 300000  ./run/test/specs/*.spec.ts --grep ",
-    "test-one": "_TESTING=1 _FORCE_LOGS=0 npx playwright test --timeout 300000  ./run/test/**/*.spec.ts --grep",
-    "test-udid": "_TESTING=1 npx playwright test UDID=$udid --timeout 300000 ./run/test/**/*.spec.ts --grep",
-    "test-ios": "_TESTING=1 npx playwright test --timeout 400000 ./run/test/**/*.spec.ts --grep '@ios'",
-    "test-android": "_TESTING=1 npx playwright test --timeout 300000 ./run/test/**/*.spec.ts --grep '@android'",
-    "build-and-test": "yarn tsc && yarn test",
-    "test-one-logs": "_TESTING=1  _FORCELOGS=1 npx playwright test --timeout 300000 --retries 0 ./run/test/**/*.spec.ts --grep",
-    "test-parallel": "_TESTING=1 npx playwright test ./run/test/**/*.spec.ts --grep '@ios'",
-    "test-high-risk-android": "_TESTING=1 npx playwright test --timeout 300000 ./run/test/**/*.spec.ts --grep '@android @high-risk'",
-    "test-high-risk-ios": "_TESTING=1 npx playwright test --timeout 300000 ./run/test/**/*.spec.ts --grep '@ios @high-risk'",
+    "test": "npx playwright test --grep ",
+    "test-no-retry": "_TESTING=1 npx playwright test --grep ",
+    "test-one": "_TESTING=1 _FORCE_LOGS=0 npx playwright test --grep",
+    "test-udid": "_TESTING=1 npx playwright test UDID=$udid --grep",
+    "test-ios": "_TESTING=1 npx playwright test --grep '@ios'",
+    "test-android": "_TESTING=1 npx playwright test --grep '@android'",
+    "test-one-logs": "_TESTING=1  _FORCELOGS=1 npx playwright test --retries 0 ./run/test/**/*.spec.ts --grep",
+    "test-high-risk-android": "_TESTING=1 npx playwright test --grep '@android @high-risk'",
+    "test-high-risk-ios": "_TESTING=1 npx playwright test --grep '@ios @high-risk'",
     "start-server": "./node_modules/.bin/appium server --use-drivers=uiautomator2,xcuitest --port 8110 --allow-cors"
   },
   "devDependencies": {

run/localizer/locales.ts

@@ -550,7 +550,7 @@ export const simpleDictionary = {
     en: 'Ban User',
     args: undefined,
   },
-  banbobanned: {
+  banUserBanned: {
     en: 'User banned',
     args: undefined,
   },

run/test/specs/landing_page_restore_account.spec.ts

@@ -1,8 +1,9 @@
 import { bothPlatformsIt } from '../../types/sessionIt';
-import { closeApp, SupportedPlatformsType } from './utils/open_app';
+import { closeApp, openAppTwoDevices, SupportedPlatformsType } from './utils/open_app';
 import { verifyElementScreenshot } from './utils/verify_screenshots';
 import { EmptyLandingPageScreenshot } from './utils/screenshot_paths';
-import { open_Alice2 } from './state_builder';
+import { USERNAME } from '@session-foundation/qa-seeder';
+import { linkedDevice } from './utils/link_device';
 
 bothPlatformsIt({
   title: 'Landing page restore account',
@@ -13,14 +14,9 @@ bothPlatformsIt({
 
 async function landingPageRestoreAccount(platform: SupportedPlatformsType) {
   // Creating a linked device is used as a shortcut to restore an account
-  const {
-    devices: { alice1, alice2 },
-  } = await open_Alice2({ platform });
+  const { device1: alice1, device2: alice2 } = await openAppTwoDevices(platform);
+  await linkedDevice(alice1, alice2, USERNAME.ALICE);
   // Verify that the Session logo is shown on the landing page
-  await verifyElementScreenshot(
-    alice2,
-    new EmptyLandingPageScreenshot(alice2),
-    'restore_account'
-  );
+  await verifyElementScreenshot(alice2, new EmptyLandingPageScreenshot(alice2), 'restore_account');
   await closeApp(alice1, alice2);
 }

run/test/specs/linked_device.spec.ts

@@ -1,7 +1,8 @@
+import { USERNAME } from '@session-foundation/qa-seeder';
 import { bothPlatformsIt } from '../../types/sessionIt';
 import { UserSettings } from './locators/settings';
-import { open_Alice2 } from './state_builder';
-import { SupportedPlatformsType, closeApp } from './utils/open_app';
+import { linkedDevice } from './utils/link_device';
+import { SupportedPlatformsType, closeApp, openAppTwoDevices } from './utils/open_app';
 
 bothPlatformsIt({
   title: 'Link device',
@@ -12,10 +13,9 @@ bothPlatformsIt({
 
 async function linkDevice(platform: SupportedPlatformsType) {
   // Open server and two devices
-  const {
-    devices: { alice1, alice2 },
-    prebuilt: { alice },
-  } = await open_Alice2({ platform });
+  const { device1: alice1, device2: alice2 } = await openAppTwoDevices(platform);
+  // link device
+  const alice = await linkedDevice(alice1, alice2, USERNAME.ALICE);
   // Check that 'Youre almost finished' reminder doesn't pop up on alice2
   await alice2.hasElementBeenDeleted({
     strategy: 'accessibility id',

run/test/specs/state_builder/index.ts

@@ -206,7 +206,7 @@ export async function open_Alice1_Bob1_Charlie1_Unknown1({
   });
 
   const seedPhrases = result.prebuilt.users.map(m => m.seedPhrase);
-  await linkDevices(result.devices, seedPhrases);
+  await linkDevices(result.devices.slice(0, -1), seedPhrases);
 
   const formattedGroup = { group: result.prebuilt.group };