Eliminate some auxiliar contexts from E2E test suite

Author: tassoevan

apps/meteor/tests/e2e/omnichannel/omnichannel-livechat.spec.ts

@@ -1,3 +1,5 @@
+import type { Page } from 'playwright-core';
+
 import { createFakeVisitor } from '../../mocks/data';
 import { createAuxContext } from '../fixtures/createAuxContext';
 import { Users } from '../fixtures/userStates';
@@ -15,14 +17,15 @@ test.use({ storageState: Users.user1.state });
 test.describe.serial('OC - Livechat', () => {
 	let poLiveChat: OmnichannelLiveChat;
 	let poHomeOmnichannel: HomeOmnichannel;
+	let livechatPage: Page;
 
 	test.beforeAll(async ({ api }) => {
 		const statusCode = (await api.post('/livechat/users/agent', { username: 'user1' })).status();
 		expect(statusCode).toBe(200);
 	});
 
 	test.beforeAll(async ({ browser, api }) => {
-		const { page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false);
+		({ page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false));
 
 		poLiveChat = new OmnichannelLiveChat(livechatPage, api);
 	});
@@ -35,7 +38,7 @@ test.describe.serial('OC - Livechat', () => {
 	});
 
 	test.afterAll(async ({ api }) => {
-		await Promise.all([api.delete('/livechat/users/agent/user1'), poLiveChat.page.close()]);
+		await Promise.all([api.delete('/livechat/users/agent/user1'), livechatPage.close()]);
 	});
 
 	test('OC - Livechat - Send message to online agent', async () => {
@@ -110,27 +113,32 @@ test.describe.serial('OC - Livechat', () => {
 test.describe.serial('OC - Livechat - Visitors closing the room is disabled', () => {
 	let poLiveChat: OmnichannelLiveChat;
 	let poHomeOmnichannel: HomeOmnichannel;
+	let livechatPage: Page;
+	let omniPage: Page;
 
 	test.beforeAll(async ({ api }) => {
 		await api.post('/livechat/users/agent', { username: 'user1' });
 	});
 
 	test.beforeAll(async ({ browser, api }) => {
-		const { page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false);
+		({ page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false));
 
 		poLiveChat = new OmnichannelLiveChat(livechatPage, api);
 	});
 
 	test.beforeAll(async ({ browser, api }) => {
 		await setSettingValueById(api, 'Livechat_allow_visitor_closing_chat', false);
-		const { page: omniPage } = await createAuxContext(browser, Users.user1, '/', true);
+		({ page: omniPage } = await createAuxContext(browser, Users.user1, '/', true));
 		poHomeOmnichannel = new HomeOmnichannel(omniPage);
 	});
 
 	test.afterAll(async ({ api }) => {
-		await setSettingValueById(api, 'Livechat_allow_visitor_closing_chat', true);
-		await api.delete('/livechat/users/agent/user1');
-		await poLiveChat.page.close();
+		await Promise.all([
+			setSettingValueById(api, 'Livechat_allow_visitor_closing_chat', true),
+			api.delete('/livechat/users/agent/user1'),
+			livechatPage.close(),
+			omniPage.close(),
+		]);
 	});
 
 	test('OC - Livechat - Close Chat disabled', async () => {
@@ -161,6 +169,8 @@ test.describe.serial('OC - Livechat - Visitors closing the room is disabled', ()
 test.describe.serial('OC - Livechat - Resub after close room', () => {
 	let poLiveChat: OmnichannelLiveChat;
 	let poHomeOmnichannel: HomeOmnichannel;
+	let livechatPage: Page;
+	let omniPage: Page;
 
 	test.beforeAll(async ({ api }) => {
 		const statusCode = (await api.post('/livechat/users/agent', { username: 'user1' })).status();
@@ -169,20 +179,22 @@ test.describe.serial('OC - Livechat - Resub after close room', () => {
 
 	test.beforeAll(async ({ browser, api }) => {
 		await api.post('/settings/Livechat_clear_local_storage_when_chat_ended', { value: true });
-		const { page: omniPage } = await createAuxContext(browser, Users.user1, '/', true);
+		({ page: omniPage } = await createAuxContext(browser, Users.user1, '/', true));
 		poHomeOmnichannel = new HomeOmnichannel(omniPage);
 
-		const { page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false);
+		({ page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false));
 		poLiveChat = new OmnichannelLiveChat(livechatPage, api);
 
 		await poLiveChat.sendMessageAndCloseChat(firstVisitor);
 	});
 
 	test.afterAll(async ({ api }) => {
-		await api.post('/settings/Livechat_clear_local_storage_when_chat_ended', { value: false });
-		await api.delete('/livechat/users/agent/user1');
-		await poLiveChat.page.close();
-		await poHomeOmnichannel.page.close();
+		await Promise.all([
+			api.post('/settings/Livechat_clear_local_storage_when_chat_ended', { value: false }),
+			api.delete('/livechat/users/agent/user1'),
+			livechatPage.close(),
+			omniPage.close(),
+		]);
 	});
 
 	test('OC - Livechat - Resub after close room', async () => {
@@ -210,26 +222,26 @@ test.describe.serial('OC - Livechat - Resub after close room', () => {
 test.describe('OC - Livechat - Resume chat after closing', () => {
 	let poLiveChat: OmnichannelLiveChat;
 	let poHomeOmnichannel: HomeOmnichannel;
+	let livechatPage: Page;
+	let omniPage: Page;
 
 	test.beforeAll(async ({ api }) => {
 		const statusCode = (await api.post('/livechat/users/agent', { username: 'user1' })).status();
 		expect(statusCode).toBe(200);
 	});
 
 	test.beforeAll(async ({ browser, api }) => {
-		const { page: omniPage } = await createAuxContext(browser, Users.user1, '/', true);
+		({ page: omniPage } = await createAuxContext(browser, Users.user1, '/', true));
 		poHomeOmnichannel = new HomeOmnichannel(omniPage);
 
-		const { page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false);
+		({ page: livechatPage } = await createAuxContext(browser, Users.user1, '/livechat', false));
 		poLiveChat = new OmnichannelLiveChat(livechatPage, api);
 
 		await poLiveChat.sendMessageAndCloseChat(firstVisitor);
 	});
 
 	test.afterAll(async ({ api }) => {
-		await api.delete('/livechat/users/agent/user1');
-		await poLiveChat.page.close();
-		await poHomeOmnichannel.page.close();
+		await Promise.all([api.delete('/livechat/users/agent/user1'), livechatPage.close(), omniPage.close()]);
 	});
 
 	test('OC - Livechat - Resume chat after closing', async () => {
@@ -256,14 +268,10 @@ test.describe('OC - Livechat - Resume chat after closing', () => {
 
 test.describe('OC - Livechat - Close chat using widget', () => {
 	let poLiveChat: OmnichannelLiveChat;
-	let poHomeOmnichannel: HomeOmnichannel;
 	let agent: Awaited<ReturnType<typeof createAgent>>;
 
-	test.beforeAll(async ({ browser, api }) => {
+	test.beforeAll(async ({ api }) => {
 		agent = await createAgent(api, 'user1');
-
-		const { page } = await createAuxContext(browser, Users.user1, '/');
-		poHomeOmnichannel = new HomeOmnichannel(page);
 	});
 
 	test.beforeEach(async ({ page, api }) => {
@@ -273,7 +281,6 @@ test.describe('OC - Livechat - Close chat using widget', () => {
 	});
 
 	test.afterAll(async () => {
-		await poHomeOmnichannel.page.close();
 		await agent.delete();
 	});