change new setting value on existing EE tests to match old behavior

RocketChat · Oct 21, 2024 · 8f66997 · 8f66997
1 parent 0ae0f31
commit 8f66997
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 15 deletions.
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-current-chats.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-current-chats.spec.ts
@@ -30,6 +30,7 @@ test.describe('OC - Current Chats [Auto Selection]', async () => {
 		const responses = await Promise.all([
 			api.post('/settings/Livechat_allow_manual_on_hold', { value: true }),
 			api.post('/settings/Livechat_allow_manual_on_hold_upon_agent_engagement_only', { value: false }),
+			api.post('/settings/Livechat_Require_Contact_Verification', { value: 'never' }),
 		]);
 		responses.forEach((res) => expect(res.status()).toBe(200));
 	});

diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts
@@ -75,6 +75,10 @@ test.describe('OC - Livechat API', () => {
 		let agent: Awaited<ReturnType<typeof createAgent>>;
 
 		test.beforeAll(async ({ browser, api }) => {
+			if (IS_EE) {
+				await api.post('/settings/Livechat_Require_Contact_Verification', { value: 'never' });
+			}
+
 			agent = await createAgent(api, 'user1');
 
 			page = await browser.newPage();

diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-avatar-visibility.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-avatar-visibility.spec.ts
@@ -1,6 +1,7 @@
 import type { Page } from '@playwright/test';
 
 import { createFakeVisitor } from '../../mocks/data';
+import { IS_EE } from '../config/constants';
 import { createAuxContext } from '../fixtures/createAuxContext';
 import { Users } from '../fixtures/userStates';
 import { HomeOmnichannel, OmnichannelLiveChatEmbedded } from '../page-objects';
@@ -30,6 +31,10 @@ test.describe('OC - Livechat - Avatar visibility', async () => {
 		if (res.status() !== 200) {
 			throw new Error('Failed to make agent available');
 		}
+
+		if (IS_EE) {
+			await api.post('/settings/Livechat_Require_Contact_Verification', { value: 'never' });
+		}
 	});
 
 	test.beforeEach(async ({ browser }) => {

diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-department.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-department.spec.ts
@@ -24,6 +24,8 @@ test.describe('OC - Livechat - Department Flow', () => {
 	let agent2: Awaited<ReturnType<typeof createAgent>>['data'];
 
 	test.beforeAll(async ({ api }) => {
+		await api.post('/settings/Livechat_Require_Contact_Verification', { value: 'never' });
+
 		// Assign agents & departments
 		agents = await Promise.all([createAgent(api, 'user1'), createAgent(api, 'user2')]);
 		[agent1, agent2] = agents.map(({ data }) => data);

diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-message-bubble-color.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-message-bubble-color.spec.ts
@@ -1,6 +1,7 @@
 import type { Page } from '@playwright/test';
 
 import { createFakeVisitor } from '../../mocks/data';
+import { IS_EE } from '../config/constants';
 import { createAuxContext } from '../fixtures/createAuxContext';
 import { Users } from '../fixtures/userStates';
 import { HomeOmnichannel, OmnichannelLiveChatEmbedded } from '../page-objects';
@@ -24,6 +25,9 @@ test.describe('OC - Livechat - Bubble background color', async () => {
 
 	test.beforeAll(async ({ api }) => {
 		agent = await createAgent(api, 'user1');
+		if (IS_EE) {
+			await api.post('/settings/Livechat_Require_Contact_Verification', { value: 'never' });
+		}
 
 		const res = await makeAgentAvailable(api, agent.data._id);
 

diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management.spec.ts
@@ -27,6 +27,7 @@ test.describe('OC - Livechat - Queue Management', () => {
 			api.post('/settings/Livechat_waiting_queue', { value: true }),
 			api.post('/settings/Livechat_waiting_queue_message', { value: waitingQueueMessage }),
 			api.post('/livechat/users/agent', { username: 'user1' }),
+			api.post('/settings/Livechat_Require_Contact_Verification', { value: 'never' }),
 		]);
 
 		const { page: omniPage } = await createAuxContext(browser, Users.user1, '/', true);

diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
@@ -83,10 +83,6 @@ describe('LIVECHAT - rooms', () => {
 		room = await createLivechatRoom(visitor.token);
 	});
 
-	after(async () => {
-		await updateEESetting('Livechat_Require_Contact_Verification', 'always');
-	});
-
 	describe('livechat/room', () => {
 		it('should fail when token is not passed as query parameter', async () => {
 			await request.get(api('livechat/room')).expect(400);

diff --git a/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts b/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts
@@ -20,7 +20,7 @@ import {
 	moveBackToQueue,
 	closeOmnichannelRoom,
 } from '../../../data/livechat/rooms';
-import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { password } from '../../../data/user';
 import { createUser, deleteUser, getMe, login, setUserStatus } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
@@ -36,6 +36,7 @@ describe('LIVECHAT - Agents', () => {
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		agent = await createAgent();
 		manager = await createManager();
 	});

diff --git a/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts b/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
@@ -18,7 +18,7 @@ import {
 } from '../../../data/livechat/rooms';
 import { createAnOnlineAgent } from '../../../data/livechat/users';
 import { sleep } from '../../../data/livechat/utils';
-import { removePermissionFromAllRoles, restorePermissionToRoles, updateSetting } from '../../../data/permissions.helper';
+import { removePermissionFromAllRoles, restorePermissionToRoles, updateEESetting, updateSetting } from '../../../data/permissions.helper';
 import { deleteUser } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
@@ -30,6 +30,7 @@ describe('LIVECHAT - dashboards', function () {
 
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 	});
 
 	let department: ILivechatDepartment;

diff --git a/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts b/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts
@@ -17,7 +17,13 @@ import {
 	takeInquiry,
 } from '../../../data/livechat/rooms';
 import { parseMethodResponse } from '../../../data/livechat/utils';
-import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
+import {
+	removePermissionFromAllRoles,
+	restorePermissionToRoles,
+	updateEESetting,
+	updatePermission,
+	updateSetting,
+} from '../../../data/permissions.helper';
 import { password } from '../../../data/user';
 import { createUser, login, deleteUser } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
@@ -28,6 +34,7 @@ describe('LIVECHAT - inquiries', () => {
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 	});
 
 	describe('livechat/inquiries.list', () => {

diff --git a/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts b/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
@@ -10,7 +10,7 @@ import { getCredentials, api, request, credentials } from '../../../data/api-dat
 import { createDepartmentWithAnOnlineAgent, deleteDepartment, addOrRemoveAgentFromDepartment } from '../../../data/livechat/department';
 import { createVisitor, createLivechatRoom, closeOmnichannelRoom, deleteVisitor } from '../../../data/livechat/rooms';
 import { createAnOnlineAgent } from '../../../data/livechat/users';
-import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { deleteUser } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
@@ -39,6 +39,7 @@ describe('LIVECHAT - Queue', () => {
 		Promise.all([
 			updateSetting('Livechat_enabled', true),
 			updateSetting('Livechat_Routing_Method', 'Auto_Selection'),
+			updateEESetting('Livechat_Require_Contact_Verification', 'never'),
 
 			// this cleanup is required since previous tests left the DB dirty
 			cleanupRooms(),

diff --git a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
@@ -17,7 +17,13 @@ import {
 } from '../../../data/livechat/rooms';
 import { getRandomVisitorToken } from '../../../data/livechat/users';
 import { getLivechatVisitorByToken } from '../../../data/livechat/visitor';
-import { updatePermission, updateSetting, removePermissionFromAllRoles, restorePermissionToRoles } from '../../../data/permissions.helper';
+import {
+	updatePermission,
+	updateSetting,
+	removePermissionFromAllRoles,
+	restorePermissionToRoles,
+	updateEESetting,
+} from '../../../data/permissions.helper';
 import { adminUsername } from '../../../data/user';
 import { IS_EE } from '../../../e2e/config/constants';
 
@@ -33,6 +39,7 @@ describe('LIVECHAT - visitors', () => {
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updatePermission('view-livechat-manager', ['admin']);
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		await createAgent();
 		await makeAgentAvailable();
 		visitor = await createVisitor();

diff --git a/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts b/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts
@@ -38,6 +38,7 @@ import { generateRandomSLAData } from '../../../e2e/utils/omnichannel/sla';
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 	});
 
 	after(async () => {

diff --git a/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts b/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts
@@ -14,14 +14,15 @@ import {
 	sendMessage,
 	fetchInquiry,
 } from '../../../data/livechat/rooms';
-import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
 (IS_EE ? describe : describe.skip)('[EE] LIVECHAT - dashboards', () => {
 	before((done) => getCredentials(done));
 
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		await createAgent();
 	});
 

diff --git a/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts b/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts
@@ -18,7 +18,7 @@ import {
 	fetchMessages,
 } from '../../../data/livechat/rooms';
 import { sleep } from '../../../data/livechat/utils';
-import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { password } from '../../../data/user';
 import { createUser, deleteUser, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
@@ -31,6 +31,7 @@ import { IS_EE } from '../../../e2e/config/constants';
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		await createAgent();
 		await makeAgentAvailable();
 	});

diff --git a/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts b/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts
@@ -15,7 +15,7 @@ import {
 	closeOmnichannelRoom,
 } from '../../../data/livechat/rooms';
 import { removeAgent } from '../../../data/livechat/users';
-import { updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updateSetting } from '../../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../../data/rooms.helper';
 
 describe('LIVECHAT - messages', () => {
@@ -26,6 +26,7 @@ describe('LIVECHAT - messages', () => {
 		agent = await createAgent();
 		await makeAgentAvailable();
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 	});
 
 	after(() => Promise.all([updateSetting('Livechat_Routing_Method', 'Auto_Selection'), removeAgent(agent._id)]));

diff --git a/apps/meteor/tests/end-to-end/api/livechat/21-reports.ts b/apps/meteor/tests/end-to-end/api/livechat/21-reports.ts
@@ -7,7 +7,7 @@ import { api, request, credentials, getCredentials } from '../../../data/api-dat
 import { createDepartment, addOrRemoveAgentFromDepartment } from '../../../data/livechat/department';
 import { startANewLivechatRoomAndTakeIt, createAgent } from '../../../data/livechat/rooms';
 import { createMonitor, createUnit } from '../../../data/livechat/units';
-import { restorePermissionToRoles, updatePermission } from '../../../data/permissions.helper';
+import { restorePermissionToRoles, updateEESetting, updatePermission } from '../../../data/permissions.helper';
 import { password } from '../../../data/user';
 import { createUser, deleteUser, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
@@ -19,6 +19,7 @@ import { IS_EE } from '../../../e2e/config/constants';
 	let agent3: { user: IUser; credentials: Credentials };
 
 	before(async () => {
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		const user = await createUser();
 		const userCredentials = await login(user.username, password);
 		if (!user.username) {

diff --git a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
@@ -704,7 +704,7 @@ describe('LIVECHAT - contacts', () => {
 			expect(res.body).to.have.property('success', false);
 			expect(res.body).to.have.property('error');
 			expect(res.body.error).to.be.equal(
-				"must have required property 'email'\n must have required property 'phone'\n must have required property 'contactId'\n must match a schema in anyOf [invalid-params]",
+				"must have required property 'email'\n must have required property 'phone'\n must have required property 'contactId'\n must match exactly one schema in oneOf [invalid-params]",
 			);
 			expect(res.body.errorType).to.be.equal('invalid-params');
 		});
@@ -715,7 +715,7 @@ describe('LIVECHAT - contacts', () => {
 			expect(res.body).to.have.property('success', false);
 			expect(res.body).to.have.property('error');
 			expect(res.body.error).to.be.equal(
-				'must NOT have additional properties\n must NOT have additional properties\n must NOT have additional properties\n must match a schema in anyOf [invalid-params]',
+				'must NOT have additional properties\n must NOT have additional properties\n must NOT have additional properties\n must match exactly one schema in oneOf [invalid-params]',
 			);
 			expect(res.body.errorType).to.be.equal('invalid-params');
 		});