test: adjust to new disabled rules

Author: ricardogarim

apps/meteor/tests/e2e/page-objects/fragments/modals/edit-status-modal.ts

@@ -48,14 +48,18 @@ export class EditStatusModal extends Modal {
 		await this.page!.getByRole('option', { name: status }).click();
 	}
 
+	async setStatusMessage(message: string): Promise<void> {
+		await this.statusMessageInput.fill(message);
+	}
+
 	async selectDuration(duration: string): Promise<void> {
 		await this.durationSelect.click();
 		await this.page!.getByRole('option', { name: new RegExp(duration) }).click();
 	}
 
 	async changeStatusMessage(statusMessage?: string): Promise<void> {
 		if (statusMessage !== undefined) {
-			await this.statusMessageInput.fill(statusMessage);
+			await this.setStatusMessage(statusMessage);
 		}
 		await this.save();
 		await this.toastMessages.dismissToast();
@@ -78,7 +82,7 @@ export class EditStatusModal extends Modal {
 			await this.selectStatusType(statusType);
 		}
 		if (message !== undefined) {
-			await this.statusMessageInput.fill(message);
+			await this.setStatusMessage(message);
 		}
 		await this.selectDuration(duration);
 		if (customDate) {

apps/meteor/tests/e2e/presence.spec.ts

@@ -66,12 +66,16 @@ test.describe.serial('Presence', () => {
 		});
 
 		test('should not save custom status as `undefined` if nothing changes', async ({ page }) => {
-			await test.step('change to empty status', async () => {
-				await poHomeChannel.navbar.changeUserCustomStatus();
-				expect(await page.evaluate(() => localStorage.getItem('fuselage-localStorage-Local_Custom_Status'))).not.toBe('undefined');
+			await poHomeChannel.navbar.openEditStatusModal();
+
+			const { editStatusModal } = poHomeChannel.navbar;
+
+			await test.step('Save stays disabled while the form is untouched', async () => {
+				await expect(editStatusModal.btnSubmit).toBeDisabled();
 			});
-			await test.step('save without changes', async () => {
-				await poHomeChannel.navbar.changeUserCustomStatus();
+
+			await test.step('closing without changes leaves stored status untouched', async () => {
+				await editStatusModal.close();
 				expect(await page.evaluate(() => localStorage.getItem('fuselage-localStorage-Local_Custom_Status'))).not.toBe('undefined');
 			});
 		});
@@ -107,6 +111,8 @@ test.describe.serial('Presence', () => {
 
 			const { editStatusModal } = poHomeChannel.navbar;
 
+			await editStatusModal.setStatusMessage('available');
+
 			await editStatusModal.selectDuration('Choose date and time');
 			await expect(editStatusModal.customDateInput).toBeVisible();
 			await expect(editStatusModal.customTimeInput).toBeVisible();
@@ -123,6 +129,8 @@ test.describe.serial('Presence', () => {
 
 			const { editStatusModal } = poHomeChannel.navbar;
 
+			await editStatusModal.setStatusMessage('available');
+
 			await editStatusModal.selectDuration('Choose date and time');
 
 			const today = new Date().toLocaleDateString('en-CA');
@@ -140,6 +148,8 @@ test.describe.serial('Presence', () => {
 
 			const { editStatusModal } = poHomeChannel.navbar;
 
+			await editStatusModal.setStatusMessage('available');
+
 			await editStatusModal.selectDuration('Choose date and time');
 			await editStatusModal.customDateInput.fill('');
 			await editStatusModal.btnSubmit.click();
@@ -171,7 +181,7 @@ test.describe.serial('Presence', () => {
 			});
 
 			await test.step('clear status', async () => {
-				await poHomeChannel.navbar.changeUserCustomStatus('');
+				await poHomeChannel.navbar.changeUserStatus('online');
 			});
 		});
 
@@ -192,7 +202,7 @@ test.describe.serial('Presence', () => {
 			});
 
 			await test.step('clear status and verify expiration is removed', async () => {
-				await poHomeChannel.navbar.changeUserCustomStatus('');
+				await poHomeChannel.navbar.changeUserStatus('online');
 
 				await poHomeChannel.navbar.btnUserMenu.click();
 				await expect(poHomeChannel.navbar.userMenu).not.toContainText('Until');