Skip to content

Commit

Permalink
feat/3052-from-edit-to-move-endpoint: improved e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
irinakartun committed Feb 6, 2025
1 parent 14c1723 commit 21594b1
Show file tree
Hide file tree
Showing 17 changed files with 167 additions and 84 deletions.
2 changes: 1 addition & 1 deletion apps/chat-e2e/src/tests/chatBarConversation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ dialTest(
1,
);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderConversations.editFolderNameWithEnter(folderName);
await folderConversations.renameEmptyFolderWithEnter(folderName);

await conversations.openEntityDropdownMenu(conversation.name);
await conversationDropdownMenu.selectMenuOption(MenuOptions.moveTo);
Expand Down
6 changes: 4 additions & 2 deletions apps/chat-e2e/src/tests/chatBarFolderConversation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ dialTest(
ExpectedConstants.newFolderWithIndexTitle(randomFolderIndex),
);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderConversations.editFolderNameWithEnter(newNameWithSpaces);
await folderConversations.renameEmptyFolderWithEnter(newNameWithSpaces);
await expect
.soft(
folderConversations.getFolderByName(newNameWithSpaces.trim()),
Expand Down Expand Up @@ -393,7 +393,9 @@ dialTest(
await dialTest.step(
'Edit folder name using tick button and verify it is renamed',
async () => {
await folderConversations.editFolderNameWithTick(newFolderNameToSet);
await folderConversations.renameFolderWithContentWithTick(
newFolderNameToSet,
);
await expect
.soft(toast.getElementLocator(), ExpectedMessages.noErrorToastIsShown)
.toBeHidden();
Expand Down
5 changes: 2 additions & 3 deletions apps/chat-e2e/src/tests/folderNameNumeration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,8 @@ dialTest(
async () => {
await folderConversations.openFolderDropdownMenu(incrementedFolderName);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderConversations.editFolderNameWithTick(
await folderConversations.renameEmptyFolderWithTick(
GeneratorUtil.randomString(5),
{ isHttpMethodTriggered: false },
);

await chatBar.createNewFolder();
Expand Down Expand Up @@ -174,7 +173,7 @@ dialTest(
nestedFolders[nestedFolderLevel - 1].name,
);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderConversations.editFolderNameWithTick(
await folderConversations.renameFolderWithContentWithTick(
expectedDuplicatedFolderName,
);

Expand Down
4 changes: 2 additions & 2 deletions apps/chat-e2e/src/tests/folderPrompts.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ dialTest(
'Select "Rename" option, set new name and verify folder is renamed',
async () => {
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithEnter(newName);
await folderPrompts.renameEmptyFolderWithEnter(newName);
await promptBarFolderAssertion.assertFolderState(
{ name: newName },
'visible',
Expand Down Expand Up @@ -196,7 +196,7 @@ dialTest(
await dialHomePage.waitForPageLoaded();
await folderPrompts.openFolderDropdownMenu(promptInFolder.folders.name);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(newName);
await folderPrompts.renameFolderWithContentWithTick(newName);
await expect
.soft(
folderPrompts.getFolderByName(newName),
Expand Down
9 changes: 3 additions & 6 deletions apps/chat-e2e/src/tests/promptFolderNamesakes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ dialTest(
ExpectedConstants.newFolderWithIndexTitle(1),
);
await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(duplicatedFolderName, {
isHttpMethodTriggered: false,
});
await folderPrompts.renameEmptyFolderWithTick(duplicatedFolderName);
});

await dialTest.step(
Expand All @@ -53,7 +51,7 @@ dialTest(
ExpectedConstants.newFolderWithIndexTitle(2),
);
await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(duplicatedFolderName, {
await folderPrompts.renameEmptyFolderWithTick(duplicatedFolderName, {
isHttpMethodTriggered: false,
});
const errorMessage = await toast.getElementContent();
Expand Down Expand Up @@ -207,9 +205,8 @@ dialTest(
ExpectedConstants.newFolderWithIndexTitle(3),
);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(
await folderPrompts.renameEmptyFolderWithTick(
ExpectedConstants.newFolderWithIndexTitle(2),
{ isHttpMethodTriggered: false },
);
});

Expand Down
11 changes: 3 additions & 8 deletions apps/chat-e2e/src/tests/promptFolderNumeration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,7 @@ dialTest(
ExpectedConstants.newFolderWithIndexTitle(folderNumber),
);
await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick('Renamed Folder', {
isHttpMethodTriggered: false,
});
await folderPrompts.renameEmptyFolderWithTick('Renamed Folder');

await promptBar.createNewFolder();
await expect
Expand Down Expand Up @@ -211,9 +209,8 @@ dialTest(
ExpectedConstants.newFolderWithIndexTitle(1),
);
await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(
await folderPrompts.renameEmptyFolderWithTick(
ExpectedConstants.newPromptFolderWithIndexTitle(999),
{ isHttpMethodTriggered: false },
);
});

Expand Down Expand Up @@ -288,9 +285,7 @@ dialTest(
ExpectedConstants.newFolderWithIndexTitle(i),
);
await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(duplicatedFolderName, {
isHttpMethodTriggered: false,
});
await folderPrompts.renameEmptyFolderWithTick(duplicatedFolderName);
await expect(
folderPrompts.getFolderByName(duplicatedFolderName, i),
ExpectedMessages.folderNameUpdated,
Expand Down
8 changes: 2 additions & 6 deletions apps/chat-e2e/src/tests/promptFoldersSpecialChars.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ dialTest(
});

await dialTest.step('Rename it to contain special characters', async () => {
await folderPrompts.editFolderNameWithTick(newNameWithSpecialChars, {
isHttpMethodTriggered: false,
});
await folderPrompts.renameEmptyFolderWithTick(newNameWithSpecialChars);
await promptBarFolderAssertion.assertFolderState(
{ name: newNameWithSpecialChars },
'visible',
Expand Down Expand Up @@ -176,9 +174,7 @@ dialTest(
async () => {
await folderPrompts.openFolderDropdownMenu(expectedName);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(newNameWithEmojis, {
isHttpMethodTriggered: false,
});
await folderPrompts.renameEmptyFolderWithTick(newNameWithEmojis);
await promptBarFolderAssertion.assertFolderState(
{ name: newNameWithEmojis },
'visible',
Expand Down
8 changes: 2 additions & 6 deletions apps/chat-e2e/src/tests/promptMaximumNameLength.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,14 @@ dialTest(
ExpectedConstants.newPromptFolderWithIndexTitle(1),
);
await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(longName, {
isHttpMethodTriggered: false,
});
await folderPrompts.renameEmptyFolderWithTick(longName);

// Rename folder_child
await folderPrompts.openFolderDropdownMenu(
ExpectedConstants.newPromptFolderWithIndexTitle(2),
);
await promptDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(longName, {
isHttpMethodTriggered: false,
});
await folderPrompts.renameEmptyFolderWithTick(longName);
},
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ dialAdminTest(

await dialTest.step('Verify folder renaming and max length', async () => {
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await selectFolders.editFolderNameWithTick(newFolderName, {
await selectFolders.renameEmptyFolderWithTick(newFolderName, {
isHttpMethodTriggered: false,
});
await selectFoldersAssertion.assertFolderState(
Expand Down Expand Up @@ -406,7 +406,7 @@ dialAdminTest(
true,
);
//TODO: remove next line when fixed https://github.com/epam/ai-dial-chat/issues/2294
await selectFolders.editFolderNameWithTick(
await selectFolders.renameEmptyFolderWithTick(
GeneratorUtil.randomString(5),
{
isHttpMethodTriggered: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ dialAdminTest(
'Create new folder, select it and verify publish path changed',
async () => {
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithTick(orgFolder, {
await selectFolders.renameEmptyFolderWithTick(orgFolder, {
isHttpMethodTriggered: false,
});
await selectFolderModal.clickSelectFolderButton({
Expand Down
28 changes: 21 additions & 7 deletions apps/chat-e2e/src/tests/publishPrompt.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,14 @@ dialAdminTest(
.getChangePublishToPath()
.changeButton.click();
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithEnter(folderName);
await selectFolders.renameEmptyFolderWithEnter(folderName, {
isHttpMethodTriggered: false,
});
await selectFolders.openFolderDropdownMenu(folderName);
await folderDropdownMenu.selectMenuOption(MenuOptions.addNewFolder);
await selectFolders.editFolderNameWithEnter(`${folderName} 2`);
await selectFolders.renameEmptyFolderWithEnter(`${folderName} 2`, {
isHttpMethodTriggered: false,
});
await selectFolders.openFolderDropdownMenu(`${folderName} 2`);
await folderDropdownMenu.selectMenuOption(MenuOptions.delete);
await confirmationDialog.confirm();
Expand Down Expand Up @@ -121,10 +125,14 @@ dialAdminTest(
'User creates folder and rename it under Organization, user renames folder',
async () => {
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithEnter(`${folderName}_rename`);
await selectFolders.renameEmptyFolderWithEnter(`${folderName}_rename`, {
isHttpMethodTriggered: false,
});
await selectFolders.openFolderDropdownMenu(`${folderName}_rename`);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await selectFolders.editFolderNameWithEnter(folderName);
await selectFolders.renameEmptyFolderWithEnter(folderName, {
isHttpMethodTriggered: false,
});
},
);

Expand All @@ -143,7 +151,9 @@ dialAdminTest(
.getChangePublishToPath()
.changeButton.click();
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithEnter(folderName);
await selectFolders.renameEmptyFolderWithEnter(folderName, {
isHttpMethodTriggered: false,
});
},
);

Expand Down Expand Up @@ -514,14 +524,18 @@ dialAdminTest(
.getChangePublishToPath()
.changeButton.click();
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithEnter(`${folderNameTemplate} 1`);
await selectFolders.renameEmptyFolderWithEnter(
`${folderNameTemplate} 1`,
{ isHttpMethodTriggered: false },
);
for (let i = 1; i < 4; i++) {
await selectFolders.openFolderDropdownMenu(
`${folderNameTemplate} ${i}`,
);
await folderDropdownMenu.selectMenuOption(MenuOptions.addNewFolder);
await selectFolders.editFolderNameWithEnter(
await selectFolders.renameEmptyFolderWithEnter(
`${folderNameTemplate} ${i + 1}`,
{ isHttpMethodTriggered: false },
);
}
await selectFolders.openFolderDropdownMenu(`${folderNameTemplate} 4`);
Expand Down
20 changes: 11 additions & 9 deletions apps/chat-e2e/src/tests/selectUploadFolder.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ dialTest(
await dialTest.step(
'Set new name, hit Enter and verify name is updated, edit mode is closed',
async () => {
await selectFolders.editFolderNameWithEnter(updatedFolderName);
await selectFolders.renameEmptyFolderWithEnter(updatedFolderName, {
isHttpMethodTriggered: false,
});
await expect
.soft(
selectFolders.getEditFolderInput().getElementLocator(),
Expand Down Expand Up @@ -255,7 +257,7 @@ dialTest(
'Click "Create new folder" icon, set long folder name and verify it is truncated with dots',
async () => {
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithTick(longFolderName, {
await selectFolders.renameEmptyFolderWithTick(longFolderName, {
isHttpMethodTriggered: false,
});
const folderNameOverflowProp = await selectFolders
Expand Down Expand Up @@ -296,7 +298,7 @@ dialTest(
async () => {
await selectFolders.openFolderDropdownMenu(longFolderName);
await folderDropdownMenu.selectMenuOption(MenuOptions.addNewFolder);
await selectFolders.editFolderNameWithTick(longFolderName, {
await selectFolders.renameEmptyFolderWithTick(longFolderName, {
isHttpMethodTriggered: false,
});
const childFolderNameOverflowProp = await selectFolders
Expand Down Expand Up @@ -376,7 +378,7 @@ dialTest(
'Click "Create new folder" again and edit name to "New folder 999"',
async () => {
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithTick(
await selectFolders.renameEmptyFolderWithTick(
ExpectedConstants.newFolderWithIndexTitle(updateFoldeNameIndex),
{ isHttpMethodTriggered: false },
);
Expand Down Expand Up @@ -521,7 +523,7 @@ dialTest(
2,
);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await selectFolders.editFolderNameWithTick(newChildFolderName, {
await selectFolders.renameEmptyFolderWithTick(newChildFolderName, {
isHttpMethodTriggered: false,
});
await expect
Expand All @@ -543,7 +545,7 @@ dialTest(
ExpectedConstants.newFolderWithIndexTitle(1),
);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await selectFolders.editFolderNameWithTick(newParentFolderName, {
await selectFolders.renameEmptyFolderWithTick(newParentFolderName, {
isHttpMethodTriggered: false,
});
//TODO: remove next line when fixed https://github.com/epam/ai-dial-chat/issues/1551
Expand Down Expand Up @@ -602,7 +604,7 @@ dialTest(
'Click "Create new folder" again, set new folder name with end dot, confirm and verify error toast is shown',
async () => {
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithTick(
await selectFolders.renameEmptyFolderWithTick(
`${GeneratorUtil.randomString(10)}.`,
{ isHttpMethodTriggered: false },
);
Expand All @@ -620,7 +622,7 @@ dialTest(
'Create new folder, set name to already existing one, confirm and verify error message is shown',
async () => {
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithTick(
await selectFolders.renameEmptyFolderWithTick(
ExpectedConstants.newFolderWithIndexTitle(1),
{ isHttpMethodTriggered: false },
);
Expand Down Expand Up @@ -673,7 +675,7 @@ dialTest(
async () => {
const nameWithSpaces = GeneratorUtil.randomArrayElement(['', ' ']);
await selectFolderModal.newFolderButton.click();
await selectFolders.editFolderNameWithTick(nameWithSpaces, {
await selectFolders.renameEmptyFolderWithTick(nameWithSpaces, {
isHttpMethodTriggered: false,
});
await expect
Expand Down
5 changes: 4 additions & 1 deletion apps/chat-e2e/src/tests/sharedChatIcons.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,10 @@ dialTest(
nestedFolders[nestedLevel - 2].name,
);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderConversations.editFolderNameWithEnter(newFolderName);
await folderConversations.renameFolderWithContentWithEnter(
newFolderName,
{ isHttpMethodTriggered: false },
);

expect
.soft(
Expand Down
6 changes: 6 additions & 0 deletions apps/chat-e2e/src/tests/sharedFilesAttachments.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,8 @@ dialSharedWithMeTest(
await additionalShareUserDialHomePage.waitForPageLoaded();
await additionalShareUserSharedWithMeConversations.selectConversation(
conversationWithTwoRequestsWithAttachments.name,
undefined,
{ isHttpMethodTriggered: true },
);

await additionalShareUserChatMessages.expandChatMessageAttachment(
Expand Down Expand Up @@ -695,6 +697,8 @@ dialSharedWithMeTest(
async () => {
await additionalShareUserSharedWithMeConversations.selectConversation(
conversationWithTwoResponsesWithAttachments.name,
undefined,
{ isHttpMethodTriggered: true },
);

await additionalShareUserChatMessages.expandChatMessageAttachment(
Expand Down Expand Up @@ -734,6 +738,8 @@ dialSharedWithMeTest(

await additionalShareUserSharedWithMeConversations.selectConversation(
user1ConversationInFolder.name,
undefined,
{ isHttpMethodTriggered: true },
);

await additionalShareUserChatMessages.expandChatMessageAttachment(
Expand Down
2 changes: 1 addition & 1 deletion apps/chat-e2e/src/tests/sharedPromptFolderIcons.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ dialTest(
nestedFolders[sharedFolderIndex].name,
);
await folderDropdownMenu.selectMenuOption(MenuOptions.rename);
await folderPrompts.editFolderNameWithTick(newFolderName, {
await folderPrompts.renameEmptyFolderWithTick(newFolderName, {
isHttpMethodTriggered: false,
});
await confirmationDialogAssertion.assertConfirmationMessage(
Expand Down
Loading

0 comments on commit 21594b1

Please sign in to comment.