Skip to content

Commit 8faa8ba

Browse files
Miki-SessionMiki-Session
committed
chore: replace all clickOnTestIdWithText instances with locators
1 parent 9c287e4 commit 8faa8ba

24 files changed

+366
-152
lines changed

‎tests/automation/delete_account.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ sessionTestTwoWindows(
110110

111111
await clickOnTestIdWithText(
112112
restoringWindow,
113-
HomeScreen.newConversationButton.selector,
113+
HomeScreen.plusButton.selector,
114114
); // Expect contacts list to be empty
115115

116116
await hasElementBeenDeleted(
@@ -177,7 +177,7 @@ sessionTestTwoWindows(
177177
await clickOnElement({
178178
window: restoringWindow,
179179
strategy: 'data-testid',
180-
selector: HomeScreen.newConversationButton.selector,
180+
selector: HomeScreen.plusButton.selector,
181181
});
182182
await waitForElement(
183183
restoringWindow,

‎tests/automation/disappearing_message_checks.spec.ts‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ import {
77
mediaArray,
88
testLink,
99
} from './constants/variables';
10-
import { Conversation, Global } from './locators';
10+
import {
11+
Conversation,
12+
ConversationSettings,
13+
Global,
14+
HomeScreen,
15+
} from './locators';
1116
import { test_Alice_1W_Bob_1W } from './setup/sessionTest';
1217
import { createContact } from './utilities/create_contact';
1318
import { joinCommunity } from './utilities/join_community';
@@ -237,8 +242,14 @@ test_Alice_1W_Bob_1W(
237242
await joinCommunity(aliceWindow1);
238243
// To stop the layout shift
239244
await sleepFor(500);
240-
await clickOnTestIdWithText(aliceWindow1, 'conversation-options-avatar');
241-
await clickOnTestIdWithText(aliceWindow1, 'invite-contacts-menu-option');
245+
await clickOnTestIdWithText(
246+
aliceWindow1,
247+
Conversation.conversationSettingsIcon.selector,
248+
);
249+
await clickOnTestIdWithText(
250+
aliceWindow1,
251+
ConversationSettings.inviteContactsOption.selector,
252+
);
242253
await waitForTestIdWithText(
243254
aliceWindow1,
244255
'modal-heading',
@@ -249,16 +260,16 @@ test_Alice_1W_Bob_1W(
249260
Global.contactItem.selector,
250261
bob.userName,
251262
);
252-
await clickOnTestIdWithText(aliceWindow1, 'session-confirm-ok-button');
263+
await clickOnTestIdWithText(aliceWindow1, Global.confirmButton.selector);
253264
// For lack of a unique ID we use native Playwright methods
254265
await aliceWindow1
255266
.getByTestId('invite-contacts-dialog')
256267
.getByTestId('modal-close-button')
257268
.click();
258-
await clickOnTestIdWithText(aliceWindow1, 'modal-close-button');
269+
await clickOnTestIdWithText(aliceWindow1, Global.modalCloseButton.selector);
259270
await clickOnTestIdWithText(
260271
aliceWindow1,
261-
'module-conversation__user__profile-name',
272+
HomeScreen.conversationItemName.selector,
262273
bob.userName,
263274
);
264275
await Promise.all([
@@ -312,7 +323,7 @@ test_Alice_1W_Bob_1W(
312323
await Promise.all([
313324
waitForTestIdWithText(
314325
aliceWindow1,
315-
'disappear-control-message',
326+
Conversation.disappearingControlMessage.selector,
316327
englishStrippedStr('disappearingMessagesSetYou')
317328
.withArgs({
318329
time: formattedTime,
@@ -322,7 +333,7 @@ test_Alice_1W_Bob_1W(
322333
),
323334
waitForTestIdWithText(
324335
bobWindow1,
325-
'disappear-control-message',
336+
Conversation.disappearingControlMessage.selector,
326337
englishStrippedStr('disappearingMessagesSet')
327338
.withArgs({
328339
time: formattedTime,

‎tests/automation/group_testing.spec.ts‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import { englishStrippedStr } from '../localization/englishStrippedStr';
22
import { doForAll, sleepFor } from '../promise_utils';
3-
import { Global, HomeScreen } from './locators';
3+
import {
4+
Conversation,
5+
ConversationSettings,
6+
Global,
7+
HomeScreen,
8+
} from './locators';
49
import { createGroup } from './setup/create_group';
510
import { newUser } from './setup/new_user';
611
import {
@@ -128,14 +133,23 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
128133
// Click on conversation options
129134
// Check to see that you can't change group name to empty string
130135
// Click on edit group name
131-
await clickOnTestIdWithText(aliceWindow1, 'conversation-options-avatar');
132-
await clickOnTestIdWithText(aliceWindow1, 'edit-group-name');
133-
await clickOnTestIdWithText(aliceWindow1, 'clear-group-info-name-button');
134-
await waitForTestIdWithText(aliceWindow1, 'error-message');
136+
await clickOnTestIdWithText(
137+
aliceWindow1,
138+
Conversation.conversationSettingsIcon.selector,
139+
);
140+
await clickOnTestIdWithText(
141+
aliceWindow1,
142+
ConversationSettings.editGroupButton.selector,
143+
);
144+
await clickOnTestIdWithText(
145+
aliceWindow1,
146+
ConversationSettings.clearGroupNameButton.selector,
147+
);
148+
await waitForTestIdWithText(aliceWindow1, Global.errorMessage.selector);
135149
const actualError = await grabTextFromElement(
136150
aliceWindow1,
137151
'data-testid',
138-
'error-message',
152+
Global.errorMessage.selector,
139153
);
140154
if (actualError !== expectedError) {
141155
throw new Error(
@@ -146,7 +160,7 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
146160
aliceWindow1,
147161
englishStrippedStr('cancel').toString(),
148162
);
149-
await clickOnTestIdWithText(aliceWindow1, 'modal-close-button');
163+
await clickOnTestIdWithText(aliceWindow1, Global.modalCloseButton.selector);
150164
},
151165
);
152166

‎tests/automation/input_validations.spec.ts‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { englishStrippedStr } from '../localization/englishStrippedStr';
2+
import { Global, Onboarding } from './locators';
23
import { sessionTestOneWindow } from './setup/sessionTest';
34
import {
5+
clickOn,
46
clickOnTestIdWithText,
57
grabTextFromElement,
68
typeIntoInput,
@@ -35,9 +37,9 @@ import {
3537
},
3638
].forEach(({ testName, incorrectSeed, expectedError }) => {
3739
sessionTestOneWindow(`Seed validation: "${testName}"`, async ([window]) => {
38-
await clickOnTestIdWithText(window, 'existing-account-button');
40+
await clickOn(window, Onboarding.iHaveAnAccountButton);
3941
await typeIntoInput(window, 'recovery-phrase-input', incorrectSeed);
40-
await clickOnTestIdWithText(window, 'continue-button');
42+
await clickOn(window, Global.continueButton);
4143
await waitForTestIdWithText(window, 'error-message');
4244
const actualError = await grabTextFromElement(
4345
window,
@@ -71,14 +73,17 @@ import {
7173
sessionTestOneWindow(
7274
`Display name validation: "${testName}"`,
7375
async ([window]) => {
74-
await clickOnTestIdWithText(window, 'create-account-button');
76+
await clickOnTestIdWithText(
77+
window,
78+
Onboarding.createAccountButton.selector,
79+
);
7580
await typeIntoInput(window, 'display-name-input', displayName);
76-
await clickOnTestIdWithText(window, 'continue-button');
77-
await waitForTestIdWithText(window, 'error-message');
81+
await clickOnTestIdWithText(window, Global.continueButton.selector);
82+
await waitForTestIdWithText(window, Global.errorMessage.selector);
7883
const actualError = await grabTextFromElement(
7984
window,
8085
'data-testid',
81-
'error-message',
86+
Global.errorMessage.selector,
8287
);
8388
if (testName === 'No name') {
8489
console.log('Expected failure: see SES-2832');

‎tests/automation/linked_device_group.spec.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
118118
);
119119
// Check right panel has correct name
120120
await waitForTestIdWithText(aliceWindow2, 'group-name');
121-
await clickOnTestIdWithText(aliceWindow2, 'manage-members-menu-option');
121+
await clickOnTestIdWithText(
122+
aliceWindow2,
123+
ConversationSettings.manageMembersOption.selector,
124+
);
122125
await waitForTestIdWithText(
123126
aliceWindow2,
124127
'modal-heading',

‎tests/automation/linked_device_requests.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ test_Alice_2W_Bob_1W(
6464
await clickOnTestIdWithText(aliceWindow2, Global.backButton.selector);
6565
await clickOnTestIdWithText(
6666
aliceWindow2,
67-
HomeScreen.newConversationButton.selector,
67+
HomeScreen.plusButton.selector,
6868
);
6969
await waitForTestIdWithText(
7070
aliceWindow2,

‎tests/automation/linked_device_user.spec.ts‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@ sessionTestOneWindow('Link a device', async ([aliceWindow1]) => {
4242
try {
4343
const userA = await newUser(aliceWindow1, 'Alice');
4444
aliceWindow2 = await linkedDevice(userA.recoveryPassword); // not using fixture here as we want to check the behavior finely
45-
await clickOnTestIdWithText(aliceWindow1, 'leftpane-primary-avatar');
45+
await clickOnTestIdWithText(aliceWindow1, LeftPane.profileButton.selector);
4646
// Verify Username
4747
await waitForTestIdWithText(
4848
aliceWindow1,
49-
'your-profile-name',
49+
Settings.displayName.selector,
5050
userA.userName,
5151
);
5252
// Verify Account ID
5353
await waitForTestIdWithText(
5454
aliceWindow1,
55-
'your-account-id',
55+
Settings.accountId.selector,
5656
userA.accountid,
5757
);
5858
// exit profile modal
59-
await clickOnTestIdWithText(aliceWindow1, 'modal-close-button');
59+
await clickOnTestIdWithText(aliceWindow1, Global.modalCloseButton.selector);
6060
// You're almost finished isn't displayed
6161
const errorDesc = 'Should not be found';
6262
try {
@@ -143,11 +143,20 @@ test_Alice_2W(
143143
await clickOnTestIdWithText(aliceWindow1, LeftPane.profileButton.selector);
144144
// Click on current profile picture
145145
await clickOnTestIdWithText(aliceWindow1, Settings.displayName.selector);
146-
await clickOnTestIdWithText(aliceWindow1, 'image-upload-section');
147-
await clickOnTestIdWithText(aliceWindow1, 'image-upload-click');
146+
await clickOnTestIdWithText(
147+
aliceWindow1,
148+
Settings.imageUploadSection.selector,
149+
);
150+
await clickOnTestIdWithText(
151+
aliceWindow1,
152+
Settings.imageUploadClick.selector,
153+
);
148154
// allow for the image to be resized before we try to save it
149155
await sleepFor(500);
150-
await clickOnTestIdWithText(aliceWindow1, 'save-button-profile-update');
156+
await clickOnTestIdWithText(
157+
aliceWindow1,
158+
Settings.saveProfileUpdateButton.selector,
159+
);
151160
await waitForLoadingAnimationToFinish(aliceWindow1, 'loading-spinner');
152161
await clickOnMatchingText(
153162
aliceWindow1,
@@ -443,17 +452,23 @@ test_Alice_2W_Bob_1W(
443452
test_Alice_2W(
444453
'Hide note to self syncs',
445454
async ({ alice, aliceWindow1, aliceWindow2 }) => {
446-
await clickOnTestIdWithText(aliceWindow1, 'new-conversation-button');
447455
await clickOnTestIdWithText(
448456
aliceWindow1,
449-
'chooser-new-conversation-button',
457+
HomeScreen.plusButton.selector,
458+
);
459+
await clickOnTestIdWithText(
460+
aliceWindow1,
461+
HomeScreen.newMessageOption.selector,
450462
);
451463
await typeIntoInput(
452464
aliceWindow1,
453-
'new-session-conversation',
465+
HomeScreen.newMessageAccountIDInput.selector,
454466
alice.accountid,
455467
);
456-
await clickOnTestIdWithText(aliceWindow1, 'next-new-conversation-button');
468+
await clickOnTestIdWithText(
469+
aliceWindow1,
470+
HomeScreen.newMessageNextButton.selector,
471+
);
457472
await waitForTestIdWithText(
458473
aliceWindow1,
459474
'header-conversation-name',
@@ -464,18 +479,18 @@ test_Alice_2W(
464479
await sleepFor(1000);
465480
await waitForTestIdWithText(
466481
aliceWindow2,
467-
'module-conversation__user__profile-name',
482+
HomeScreen.conversationItemName.selector,
468483
englishStrippedStr('noteToSelf').toString(),
469484
);
470485
await clickOnTestIdWithText(
471486
aliceWindow1,
472-
'module-conversation__user__profile-name',
487+
HomeScreen.conversationItemName.selector,
473488
englishStrippedStr('noteToSelf').toString(),
474489
true,
475490
);
476491
await clickOnTestIdWithText(
477492
aliceWindow1,
478-
'context-menu-item',
493+
Global.contextMenuItem.selector,
479494
englishStrippedStr('noteToSelfHide').toString(),
480495
);
481496
await checkModalStrings(
@@ -485,7 +500,7 @@ test_Alice_2W(
485500
);
486501
await clickOnTestIdWithText(
487502
aliceWindow1,
488-
'session-confirm-ok-button',
503+
Global.confirmButton.selector,
489504
englishStrippedStr('hide').toString(),
490505
);
491506
// Check linked device for hidden note to self
@@ -494,14 +509,14 @@ test_Alice_2W(
494509
hasElementBeenDeleted(
495510
aliceWindow1,
496511
'data-testid',
497-
'module-conversation__user__profile-name',
512+
HomeScreen.conversationItemName.selector,
498513
5000,
499514
englishStrippedStr('noteToSelf').toString(),
500515
),
501516
hasElementBeenDeleted(
502517
aliceWindow2,
503518
'data-testid',
504-
'module-conversation__user__profile-name',
519+
HomeScreen.conversationItemName.selector,
505520
15_000,
506521
englishStrippedStr('noteToSelf').toString(),
507522
),

0 commit comments

Comments
 (0)