From 2010fa89f553a8b06f51e6afe94deb6efc824d94 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 29 Sep 2022 14:04:09 +1000
Subject: [PATCH] test: fix integration tests

---
 stylesheets/_modal.scss                   | 9 ++++++++-
 ts/components/basic/SessionRadio.tsx      | 2 ++
 ts/test/automation/change_avatar.spec.ts  | 3 +++
 ts/test/automation/delete_account.spec.ts | 7 ++++---
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/stylesheets/_modal.scss b/stylesheets/_modal.scss
index 495cc97df..684f622e7 100644
--- a/stylesheets/_modal.scss
+++ b/stylesheets/_modal.scss
@@ -131,8 +131,15 @@
   //   }
   // }
 
-  input {
+  input[type='radio'] {
+    width: inherit;
+  }
+
+  input:not([type='radio']) {
     width: 100%;
+  }
+
+  input {
     padding: 8px;
     margin-bottom: 15px;
     border: 0;
diff --git a/ts/components/basic/SessionRadio.tsx b/ts/components/basic/SessionRadio.tsx
index f8d24945f..70c5fcce1 100644
--- a/ts/components/basic/SessionRadio.tsx
+++ b/ts/components/basic/SessionRadio.tsx
@@ -79,6 +79,7 @@ export const SessionRadio = (props: Props) => {
         filledSize={filledSize * 2}
         outlineOffset={outlineOffset}
         selectedColor={selectedColor}
+        data-testid={`input-${value}`}
       />
       <StyledLabel
         role="button"
@@ -88,6 +89,7 @@ export const SessionRadio = (props: Props) => {
         outlineOffset={outlineOffset}
         beforeMargins={beforeMargins}
         aria-label={label}
+        data-testid={`label-${value}`}
       >
         {label}
       </StyledLabel>
diff --git a/ts/test/automation/change_avatar.spec.ts b/ts/test/automation/change_avatar.spec.ts
index 5dceda607..cb25d6b28 100644
--- a/ts/test/automation/change_avatar.spec.ts
+++ b/ts/test/automation/change_avatar.spec.ts
@@ -3,6 +3,7 @@ import { openAppAndWait } from './setup/open';
 import { beforeAllClean, forceCloseAllWindows } from './setup/beforeEach';
 import { newUser } from './setup/new_user';
 import { clickOnTestIdWithText, waitForTestIdWithText } from './utils';
+import { sleepFor } from '../../session/utils/Promise';
 
 let window: Page | undefined;
 test.beforeEach(beforeAllClean);
@@ -30,7 +31,9 @@ test('Change profile picture/avatar', async () => {
   await waitForTestIdWithText(window, 'copy-button-profile-update', 'Copy');
   await clickOnTestIdWithText(window, 'modal-close-button');
 
+  await sleepFor(500);
   const leftpaneAvatarContainer = await waitForTestIdWithText(window, 'leftpane-primary-avatar');
+  await sleepFor(500);
   const screenshot = await leftpaneAvatarContainer.screenshot({
     type: 'jpeg',
     // path: 'avatar-updated-blue',
diff --git a/ts/test/automation/delete_account.spec.ts b/ts/test/automation/delete_account.spec.ts
index 815c32f56..4fb920b30 100644
--- a/ts/test/automation/delete_account.spec.ts
+++ b/ts/test/automation/delete_account.spec.ts
@@ -29,9 +29,10 @@ test('Delete account from swarm', async () => {
   // Click on clear all data
   await clickOnTestIdWithText(windowA, 'clear-data-settings-menu-item', 'Clear Data');
   // Select entire account
-  await clickOnMatchingText(windowA, 'Entire Account');
-  // Confirm deletion by clicking i am sure
-  await clickOnMatchingText(windowA, 'I am sure');
+  await clickOnTestIdWithText(windowA, 'label-device_and_network', 'Clear Device and Network');
+  // Confirm deletion by clicking Clear, twice
+  await clickOnMatchingText(windowA, 'Clear');
+  await clickOnMatchingText(windowA, 'Clear');
   await windowA.waitForTimeout(7500);
   // Wait for window to close and reopen
   await sleepFor(10000, true);