From e22dfc15ef2aed2700eac5b1f224a01464bdc579 Mon Sep 17 00:00:00 2001 From: Aleksander Nicacio da Silva Date: Thu, 22 Jun 2023 23:52:38 -0300 Subject: [PATCH] chore: improve omnichannel tests reliability (#29572) Co-authored-by: Guilherme Gazzo --- .../{ => omnichannel}/omnichannel-agents.spec.ts | 6 +++--- .../omnichannel-auto-onhold-chat-closing.spec.ts | 10 +++++----- ...channel-auto-transfer-unanswered-chat.spec.ts | 10 +++++----- .../omnichannel-canned-responses-sidebar.spec.ts | 10 +++++----- ...hannel-changing-room-priority-and-sla.spec.ts | 14 +++++++------- .../omnichannel-chat-history.spec.ts | 8 ++++---- .../omnichannel-close-chat.spec.ts | 8 ++++---- .../omnichannel-close-inquiry.spec.ts | 8 ++++---- .../omnichannel-contact-center.spec.ts | 16 ++++++++-------- .../omnichannel-contact-info.spec.ts | 8 ++++---- .../omnichannel-currentChats.spec.ts | 4 ++-- .../omnichannel-custom-fields.spec.ts | 6 +++--- .../omnichannel-departaments-ce.spec.ts | 8 ++++---- .../omnichannel-departaments.spec.ts | 8 ++++---- .../omnichannel-livechat.spec.ts | 8 ++++---- .../omnichannel-manager.spec.ts | 6 +++--- .../omnichannel-priorities.spec.ts | 8 ++++---- .../omnichannel-send-transcript.spec.ts | 10 +++++----- .../omnichannel-sla-policies.spec.ts | 12 ++++++------ .../omnichannel-takeChat.spec.ts | 8 ++++---- ...mnichannel-transfer-to-another-agents.spec.ts | 14 +++++++------- .../omnichannel-triggers.spec.ts | 8 ++++---- .../e2e/page-objects/omnichannel-triggers.ts | 2 +- 23 files changed, 100 insertions(+), 100 deletions(-) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-agents.spec.ts (90%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-auto-onhold-chat-closing.spec.ts (92%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-auto-transfer-unanswered-chat.spec.ts (90%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-canned-responses-sidebar.spec.ts (87%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-changing-room-priority-and-sla.spec.ts (90%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-chat-history.spec.ts (92%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-close-chat.spec.ts (89%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-close-inquiry.spec.ts (92%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-contact-center.spec.ts (96%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-contact-info.spec.ts (89%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-currentChats.spec.ts (96%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-custom-fields.spec.ts (91%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-departaments-ce.spec.ts (88%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-departaments.spec.ts (97%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-livechat.spec.ts (93%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-manager.spec.ts (87%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-priorities.spec.ts (96%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-send-transcript.spec.ts (89%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-sla-policies.spec.ts (94%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-takeChat.spec.ts (93%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-transfer-to-another-agents.spec.ts (88%) rename apps/meteor/tests/e2e/{ => omnichannel}/omnichannel-triggers.spec.ts (92%) diff --git a/apps/meteor/tests/e2e/omnichannel-agents.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-agents.spec.ts similarity index 90% rename from apps/meteor/tests/e2e/omnichannel-agents.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-agents.spec.ts index b5cfa4b848e..263c5660ec1 100644 --- a/apps/meteor/tests/e2e/omnichannel-agents.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-agents.spec.ts @@ -1,6 +1,6 @@ -import { Users } from './fixtures/userStates'; -import { OmnichannelAgents } from './page-objects'; -import { test, expect } from './utils/test'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelAgents } from '../page-objects'; +import { test, expect } from '../utils/test'; test.use({ storageState: Users.admin.state }); diff --git a/apps/meteor/tests/e2e/omnichannel-auto-onhold-chat-closing.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-auto-onhold-chat-closing.spec.ts similarity index 92% rename from apps/meteor/tests/e2e/omnichannel-auto-onhold-chat-closing.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-auto-onhold-chat-closing.spec.ts index f75839241ac..a20ccf05006 100644 --- a/apps/meteor/tests/e2e/omnichannel-auto-onhold-chat-closing.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-auto-onhold-chat-closing.spec.ts @@ -1,11 +1,11 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { IS_EE } from './config/constants'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeChannel } from './page-objects'; -import { test, expect } from './utils/test'; +import { IS_EE } from '../config/constants'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeChannel } from '../page-objects'; +import { test, expect } from '../utils/test'; test.describe('omnichannel-auto-onhold-chat-closing', () => { test.skip(!IS_EE, 'Enterprise Only'); diff --git a/apps/meteor/tests/e2e/omnichannel-auto-transfer-unanswered-chat.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-auto-transfer-unanswered-chat.spec.ts similarity index 90% rename from apps/meteor/tests/e2e/omnichannel-auto-transfer-unanswered-chat.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-auto-transfer-unanswered-chat.spec.ts index ef3203c91cc..67bef3dbac5 100644 --- a/apps/meteor/tests/e2e/omnichannel-auto-transfer-unanswered-chat.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-auto-transfer-unanswered-chat.spec.ts @@ -1,11 +1,11 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { IS_EE } from './config/constants'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeChannel } from './page-objects'; -import { test, expect } from './utils/test'; +import { IS_EE } from '../config/constants'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeChannel } from '../page-objects'; +import { test, expect } from '../utils/test'; test.describe('omnichannel-auto-transfer-unanswered-chat', () => { test.skip(!IS_EE, 'Enterprise Only'); diff --git a/apps/meteor/tests/e2e/omnichannel-canned-responses-sidebar.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-canned-responses-sidebar.spec.ts similarity index 87% rename from apps/meteor/tests/e2e/omnichannel-canned-responses-sidebar.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-canned-responses-sidebar.spec.ts index b34d0bfc0f7..4df5ee1dc8d 100644 --- a/apps/meteor/tests/e2e/omnichannel-canned-responses-sidebar.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-canned-responses-sidebar.spec.ts @@ -1,11 +1,11 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { IS_EE } from './config/constants'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeChannel } from './page-objects'; -import { test } from './utils/test'; +import { IS_EE } from '../config/constants'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeChannel } from '../page-objects'; +import { test } from '../utils/test'; test.describe('Omnichannel Canned Responses Sidebar', () => { test.skip(!IS_EE, 'Enterprise Only'); diff --git a/apps/meteor/tests/e2e/omnichannel-changing-room-priority-and-sla.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-changing-room-priority-and-sla.spec.ts similarity index 90% rename from apps/meteor/tests/e2e/omnichannel-changing-room-priority-and-sla.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-changing-room-priority-and-sla.spec.ts index 28ac6205978..042e43c5cc5 100644 --- a/apps/meteor/tests/e2e/omnichannel-changing-room-priority-and-sla.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-changing-room-priority-and-sla.spec.ts @@ -1,13 +1,13 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { ADMIN_CREDENTIALS, IS_EE } from './config/constants'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeChannel } from './page-objects'; -import { getPriorityByi18nLabel } from './utils/omnichannel/priority'; -import { createSLA } from './utils/omnichannel/sla'; -import { test, expect } from './utils/test'; +import { ADMIN_CREDENTIALS, IS_EE } from '../config/constants'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeChannel } from '../page-objects'; +import { getPriorityByi18nLabel } from '../utils/omnichannel/priority'; +import { createSLA } from '../utils/omnichannel/sla'; +import { test, expect } from '../utils/test'; const getRoomId = (page: Page): string => { // url is of the form: http://localhost:3000/live/:rid/room-info diff --git a/apps/meteor/tests/e2e/omnichannel-chat-history.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-chat-history.spec.ts similarity index 92% rename from apps/meteor/tests/e2e/omnichannel-chat-history.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-chat-history.spec.ts index b2406b15249..303285db352 100644 --- a/apps/meteor/tests/e2e/omnichannel-chat-history.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-chat-history.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeOmnichannel } from './page-objects'; -import { test, expect } from './utils/test'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeOmnichannel } from '../page-objects'; +import { test, expect } from '../utils/test'; test.describe('Omnichannel chat histr', () => { let poLiveChat: OmnichannelLiveChat; diff --git a/apps/meteor/tests/e2e/omnichannel-close-chat.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-close-chat.spec.ts similarity index 89% rename from apps/meteor/tests/e2e/omnichannel-close-chat.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-close-chat.spec.ts index 72ea2620c20..a69ccb1751f 100644 --- a/apps/meteor/tests/e2e/omnichannel-close-chat.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-close-chat.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeOmnichannel } from './page-objects'; -import { test, expect } from './utils/test'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeOmnichannel } from '../page-objects'; +import { test, expect } from '../utils/test'; test.describe('Omnichannel close chat', () => { let poLiveChat: OmnichannelLiveChat; diff --git a/apps/meteor/tests/e2e/omnichannel-close-inquiry.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-close-inquiry.spec.ts similarity index 92% rename from apps/meteor/tests/e2e/omnichannel-close-inquiry.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-close-inquiry.spec.ts index 3ce0fb83c92..f61da313299 100644 --- a/apps/meteor/tests/e2e/omnichannel-close-inquiry.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-close-inquiry.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeOmnichannel } from './page-objects'; -import { test, expect } from './utils/test'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeOmnichannel } from '../page-objects'; +import { test, expect } from '../utils/test'; test.describe('Omnichannel close inquiry', () => { let poLiveChat: OmnichannelLiveChat; diff --git a/apps/meteor/tests/e2e/omnichannel-contact-center.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts similarity index 96% rename from apps/meteor/tests/e2e/omnichannel-contact-center.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts index 54a1ecf35a5..b9ac92d67a9 100644 --- a/apps/meteor/tests/e2e/omnichannel-contact-center.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts @@ -1,11 +1,11 @@ import { faker } from '@faker-js/faker'; -import { createToken } from '../../client/lib/utils/createToken'; -import { IS_EE } from './config/constants'; -import { Users } from './fixtures/userStates'; -import { OmnichannelContacts } from './page-objects/omnichannel-contacts-list'; -import { OmnichannelSection } from './page-objects/omnichannel-section'; -import { test, expect } from './utils/test'; +import { createToken } from '../../../client/lib/utils/createToken'; +import { IS_EE } from '../config/constants'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelContacts } from '../page-objects/omnichannel-contacts-list'; +import { OmnichannelSection } from '../page-objects/omnichannel-section'; +import { test, expect } from '../utils/test'; const createContact = (generateToken = false) => ({ id: null, @@ -28,7 +28,7 @@ const NEW_CUSTOM_FIELD = { visibility: 'hidden', required: true, regexp: '', -} +}; const URL = { contactCenter: '/omnichannel-directory/contacts', @@ -58,7 +58,7 @@ test.describe('Omnichannel Contact Center', () => { // Add a contact const { id: _, ...data } = EXISTING_CONTACT; await api.post('/omnichannel/contact', data); - + if (IS_EE) { await api.post('/livechat/custom.field', NEW_CUSTOM_FIELD); } diff --git a/apps/meteor/tests/e2e/omnichannel-contact-info.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-info.spec.ts similarity index 89% rename from apps/meteor/tests/e2e/omnichannel-contact-info.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-contact-info.spec.ts index e0ffab80aff..6f3daaffe96 100644 --- a/apps/meteor/tests/e2e/omnichannel-contact-info.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-info.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeChannel } from './page-objects'; -import { test } from './utils/test'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeChannel } from '../page-objects'; +import { test } from '../utils/test'; test.describe('Omnichannel contact info', () => { let poLiveChat: OmnichannelLiveChat; diff --git a/apps/meteor/tests/e2e/omnichannel-currentChats.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-currentChats.spec.ts similarity index 96% rename from apps/meteor/tests/e2e/omnichannel-currentChats.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-currentChats.spec.ts index 36b91a6297b..fa606025c83 100644 --- a/apps/meteor/tests/e2e/omnichannel-currentChats.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-currentChats.spec.ts @@ -1,7 +1,7 @@ import { test, expect } from '@playwright/test'; -import { Users } from './fixtures/userStates'; -import { OmnichannelCurrentChats } from './page-objects'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelCurrentChats } from '../page-objects'; test.use({ storageState: Users.admin.state }); diff --git a/apps/meteor/tests/e2e/omnichannel-custom-fields.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-custom-fields.spec.ts similarity index 91% rename from apps/meteor/tests/e2e/omnichannel-custom-fields.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-custom-fields.spec.ts index e17864cd0d7..dd5c93609f6 100644 --- a/apps/meteor/tests/e2e/omnichannel-custom-fields.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-custom-fields.spec.ts @@ -1,6 +1,6 @@ -import { Users } from './fixtures/userStates'; -import { OmnichannelCustomFields } from './page-objects'; -import { test, expect } from './utils/test'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelCustomFields } from '../page-objects'; +import { test, expect } from '../utils/test'; test.use({ storageState: Users.admin.state }); diff --git a/apps/meteor/tests/e2e/omnichannel-departaments-ce.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments-ce.spec.ts similarity index 88% rename from apps/meteor/tests/e2e/omnichannel-departaments-ce.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-departaments-ce.spec.ts index af060db8899..f839b837a95 100644 --- a/apps/meteor/tests/e2e/omnichannel-departaments-ce.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments-ce.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { IS_EE } from './config/constants'; -import { Users } from './fixtures/userStates'; -import { OmnichannelDepartments } from './page-objects'; -import { test, expect } from './utils/test'; +import { IS_EE } from '../config/constants'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelDepartments } from '../page-objects'; +import { test, expect } from '../utils/test'; test.use({ storageState: Users.admin.state }); diff --git a/apps/meteor/tests/e2e/omnichannel-departaments.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts similarity index 97% rename from apps/meteor/tests/e2e/omnichannel-departaments.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts index 8962ed8aecd..36e2b54601f 100644 --- a/apps/meteor/tests/e2e/omnichannel-departaments.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { IS_EE } from './config/constants'; -import { Users } from './fixtures/userStates'; -import { OmnichannelDepartments } from './page-objects'; -import { test, expect } from './utils/test'; +import { IS_EE } from '../config/constants'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelDepartments } from '../page-objects'; +import { test, expect } from '../utils/test'; const ERROR = { requiredName: 'The field name is required.', diff --git a/apps/meteor/tests/e2e/omnichannel-livechat.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts similarity index 93% rename from apps/meteor/tests/e2e/omnichannel-livechat.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts index 339daba8ffd..77ab9cf8d63 100644 --- a/apps/meteor/tests/e2e/omnichannel-livechat.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { HomeOmnichannel, OmnichannelLiveChat } from './page-objects'; -import { test, expect } from './utils/test'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { HomeOmnichannel, OmnichannelLiveChat } from '../page-objects'; +import { test, expect } from '../utils/test'; const newUser = { name: `${faker.person.firstName()} ${faker.string.uuid()}}`, diff --git a/apps/meteor/tests/e2e/omnichannel-manager.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-manager.spec.ts similarity index 87% rename from apps/meteor/tests/e2e/omnichannel-manager.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-manager.spec.ts index 01802fb4340..85c0f518d36 100644 --- a/apps/meteor/tests/e2e/omnichannel-manager.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-manager.spec.ts @@ -1,6 +1,6 @@ -import { Users } from './fixtures/userStates'; -import { OmnichannelManager } from './page-objects'; -import { test, expect } from './utils/test'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelManager } from '../page-objects'; +import { test, expect } from '../utils/test'; test.use({ storageState: Users.admin.state }); diff --git a/apps/meteor/tests/e2e/omnichannel-priorities.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts similarity index 96% rename from apps/meteor/tests/e2e/omnichannel-priorities.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts index 56d2ee02d8b..cd66c7b164a 100644 --- a/apps/meteor/tests/e2e/omnichannel-priorities.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts @@ -1,9 +1,9 @@ import { faker } from '@faker-js/faker'; -import { IS_EE } from './config/constants'; -import { Users } from './fixtures/userStates'; -import { OmnichannelPriorities } from './page-objects/omnichannel-priorities'; -import { test, expect } from './utils/test'; +import { IS_EE } from '../config/constants'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelPriorities } from '../page-objects/omnichannel-priorities'; +import { test, expect } from '../utils/test'; const PRIORITY_NAME = faker.person.firstName(); diff --git a/apps/meteor/tests/e2e/omnichannel-send-transcript.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-send-transcript.spec.ts similarity index 89% rename from apps/meteor/tests/e2e/omnichannel-send-transcript.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-send-transcript.spec.ts index 517fadc7c01..a1c15e44df9 100644 --- a/apps/meteor/tests/e2e/omnichannel-send-transcript.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-send-transcript.spec.ts @@ -1,11 +1,11 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { IS_EE } from './config/constants'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeChannel } from './page-objects'; -import { test, expect } from './utils/test'; +import { IS_EE } from '../config/constants'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeChannel } from '../page-objects'; +import { test, expect } from '../utils/test'; test.describe('omnichannel-transcript', () => { let poLiveChat: OmnichannelLiveChat; diff --git a/apps/meteor/tests/e2e/omnichannel-sla-policies.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts similarity index 94% rename from apps/meteor/tests/e2e/omnichannel-sla-policies.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts index 1485236f9a9..5932f1b48d4 100644 --- a/apps/meteor/tests/e2e/omnichannel-sla-policies.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts @@ -1,9 +1,9 @@ import { faker } from '@faker-js/faker'; -import { IS_EE } from './config/constants'; -import { Users } from './fixtures/userStates'; -import { OmnichannelSlaPolicies } from './page-objects/omnichannel-sla-policies'; -import { test, expect } from './utils/test'; +import { IS_EE } from '../config/constants'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelSlaPolicies } from '../page-objects/omnichannel-sla-policies'; +import { test, expect } from '../utils/test'; const ERROR = { nameRequired: 'The field Name is required.', @@ -13,13 +13,13 @@ const ERROR = { const INITIAL_SLA = { name: faker.person.firstName(), description: faker.lorem.sentence(), - estimatedWaitTime: faker.string.numeric(), + estimatedWaitTime: faker.string.numeric({ length: 1, exclude: '0' }), }; const EDITED_SLA = { name: faker.person.firstName(), description: faker.lorem.sentence(), - estimatedWaitTime: faker.string.numeric(), + estimatedWaitTime: faker.string.numeric({ length: 1, exclude: '0' }), }; test.skip(!IS_EE, 'Omnichannel SLA Policies > Enterprise Only'); diff --git a/apps/meteor/tests/e2e/omnichannel-takeChat.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-takeChat.spec.ts similarity index 93% rename from apps/meteor/tests/e2e/omnichannel-takeChat.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-takeChat.spec.ts index 4190958f5e2..6314ee395f4 100644 --- a/apps/meteor/tests/e2e/omnichannel-takeChat.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-takeChat.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeChannel } from './page-objects'; -import { test, expect } from './utils/test'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeChannel } from '../page-objects'; +import { test, expect } from '../utils/test'; test.describe('omnichannel-takeChat', () => { let poLiveChat: OmnichannelLiveChat; diff --git a/apps/meteor/tests/e2e/omnichannel-transfer-to-another-agents.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-transfer-to-another-agents.spec.ts similarity index 88% rename from apps/meteor/tests/e2e/omnichannel-transfer-to-another-agents.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-transfer-to-another-agents.spec.ts index 49aba43d5c5..1a968253def 100644 --- a/apps/meteor/tests/e2e/omnichannel-transfer-to-another-agents.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-transfer-to-another-agents.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeOmnichannel } from './page-objects'; -import { test, expect } from './utils/test'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeOmnichannel } from '../page-objects'; +import { test, expect } from '../utils/test'; test.describe('omnichannel-transfer-to-another-agent', () => { let poLiveChat: OmnichannelLiveChat; @@ -58,7 +58,7 @@ test.describe('omnichannel-transfer-to-another-agent', () => { test('transfer omnichannel chat to another agent', async () => { await test.step('Expect to have 1 omnichannel assigned to agent 1', async () => { - await agent1.poHomeOmnichannel.sidenav.openChat(newVisitor.name); + await agent1.poHomeOmnichannel.sidenav.getSidebarItemByName(newVisitor.name).click(); }); await test.step('Expect to not be able to transfer chat to "user-2" when that user is offline', async () => { @@ -74,7 +74,7 @@ test.describe('omnichannel-transfer-to-another-agent', () => { await test.step('Expect to be able to transfer an omnichannel to conversation to agent 2 as agent 1 when agent 2 is online', async () => { await agent2.poHomeOmnichannel.sidenav.switchStatus('online'); - await agent1.poHomeOmnichannel.sidenav.openChat(newVisitor.name); + await agent1.poHomeOmnichannel.sidenav.getSidebarItemByName(newVisitor.name).click(); await agent1.poHomeOmnichannel.content.btnForwardChat.click(); await agent1.poHomeOmnichannel.content.inputModalAgentUserName.type('user2'); await agent1.page.locator('.rcx-option .rcx-option__wrapper >> text="user2"').click(); @@ -84,7 +84,7 @@ test.describe('omnichannel-transfer-to-another-agent', () => { }); await test.step('Expect to have 1 omnichannel assigned to agent 2', async () => { - await agent2.poHomeOmnichannel.sidenav.openChat(newVisitor.name); + await agent2.poHomeOmnichannel.sidenav.getSidebarItemByName(newVisitor.name).click(); }); }); }); diff --git a/apps/meteor/tests/e2e/omnichannel-triggers.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-triggers.spec.ts similarity index 92% rename from apps/meteor/tests/e2e/omnichannel-triggers.spec.ts rename to apps/meteor/tests/e2e/omnichannel/omnichannel-triggers.spec.ts index 57ef369445c..f1a863d8fc9 100644 --- a/apps/meteor/tests/e2e/omnichannel-triggers.spec.ts +++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-triggers.spec.ts @@ -1,10 +1,10 @@ import { faker } from '@faker-js/faker'; import type { Page } from '@playwright/test'; -import { createAuxContext } from './fixtures/createAuxContext'; -import { Users } from './fixtures/userStates'; -import { OmnichannelLiveChat, HomeOmnichannel } from './page-objects'; -import { test, expect } from './utils/test'; +import { createAuxContext } from '../fixtures/createAuxContext'; +import { Users } from '../fixtures/userStates'; +import { OmnichannelLiveChat, HomeOmnichannel } from '../page-objects'; +import { test, expect } from '../utils/test'; test.describe.serial('omnichannel-triggers', () => { let triggersName: string; diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-triggers.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-triggers.ts index b5a928ea79e..3435b28314d 100644 --- a/apps/meteor/tests/e2e/page-objects/omnichannel-triggers.ts +++ b/apps/meteor/tests/e2e/page-objects/omnichannel-triggers.ts @@ -13,7 +13,7 @@ export class OmnichannelTriggers { } get btnNew(): Locator { - return this.page.locator('text=New'); + return this.page.locator('role=button[name="New"]'); } get Name(): Locator {