Skip to content

[pull] master from mattermost:master #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Feb 11, 2026
Merged

[pull] master from mattermost:master #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3064b74
[MM-64879] Allow System Admins to view and update User AuthData and U…
hanzei Feb 11, 2026
6cd2df3
MM-67335 Fix export files having mismatched permissions (#35182)
hmhealey Feb 11, 2026
61b7fc1
MM-66789: Include log viewer (system console) in log root path valida…
wiggin77 Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 56 additions & 39 deletions ...wright/specs/functional/system_console/system_users/user_attributes_admin_editing.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ test.describe('System Console - Admin User Profile Editing', () => {
await expect(saveButton).toBeEnabled();
await saveButton.click();

// # Confirm save in the confirmation modal
await expect(systemConsolePage.page.locator('[data-testid="admin-userDetail-saveChangesModal"]')).toBeVisible();
await systemConsolePage.page.locator('#confirmModalButton').click();

// * Verify success (no error message and field retains new value)
const errorMessage = systemConsolePage.page.locator('.error-message');
await expect(errorMessage).not.toBeVisible();
Expand Down Expand Up @@ -202,6 +206,10 @@ test.describe('System Console - Admin User Profile Editing', () => {
await expect(saveButton).toBeEnabled();
await saveButton.click();

// # Confirm save in the confirmation modal
await expect(systemConsolePage.page.locator('[data-testid="admin-userDetail-saveChangesModal"]')).toBeVisible();
await systemConsolePage.page.locator('#confirmModalButton').click();

// * Verify success
const errorMessage = systemConsolePage.page.locator('.error-message');
await expect(errorMessage).not.toBeVisible();
Expand All @@ -224,6 +232,10 @@ test.describe('System Console - Admin User Profile Editing', () => {
await expect(saveButton).toBeEnabled();
await saveButton.click();

// # Confirm save in the confirmation modal
await expect(systemConsolePage.page.locator('[data-testid="admin-userDetail-saveChangesModal"]')).toBeVisible();
await systemConsolePage.page.locator('#confirmModalButton').click();

// * Verify success and persistence
const errorMessage = systemConsolePage.page.locator('.error-message');
await expect(errorMessage).not.toBeVisible();
Expand Down Expand Up @@ -256,6 +268,10 @@ test.describe('System Console - Admin User Profile Editing', () => {
// # Save the form
await saveButton.click();

// # Confirm save in the confirmation modal
await expect(systemConsolePage.page.locator('[data-testid="admin-userDetail-saveChangesModal"]')).toBeVisible();
await systemConsolePage.page.locator('#confirmModalButton').click();

// * Verify success (no error message)
const errorMessage = systemConsolePage.page.locator('.error-message');
await expect(errorMessage).not.toBeVisible();
Expand All @@ -268,66 +284,63 @@ test.describe('System Console - Admin User Profile Editing', () => {
});

test('Should validate invalid email and show error with cancel option', async () => {
// # Find system email field
const systemEmailInput = systemConsolePage.page.locator('input[type="email"]').first();
const originalEmail = await systemEmailInput.inputValue();
// # Find CPA email field (Work Email) by its label
const workEmailLabel = systemConsolePage.page.locator('label').filter({hasText: /Work Email/});
const emailInput = workEmailLabel.locator('input[type="email"]').first();
const originalEmail = await emailInput.inputValue();

// # Enter invalid email
await systemEmailInput.clear();
await systemEmailInput.fill('not-an-email');
await emailInput.clear();
await emailInput.fill('not-an-email');

// # Click Save button
const saveButton = systemConsolePage.page.locator('[data-testid="saveSetting"]');
await expect(saveButton).toBeEnabled();
await saveButton.click();
// * Verify inline validation error appears
const fieldError = workEmailLabel.locator('.field-error');
await expect(fieldError).toBeVisible();
await expect(fieldError).toContainText('Invalid email address');

// * Verify error message appears
const errorMessage = systemConsolePage.page.locator('.error-message');
await expect(errorMessage).toBeVisible();
await expect(errorMessage).toContainText('Invalid email address');
// * Verify Save button is disabled due to validation error
const saveButton = systemConsolePage.page.locator('[data-testid="saveSetting"]');
await expect(saveButton).toBeDisabled();

// * Verify Cancel button is visible and enabled
const cancelButton = systemConsolePage.page.locator('button:has-text("Cancel")');
await expect(cancelButton).toBeVisible();
await expect(cancelButton).toBeEnabled();

// * Verify Save button remains enabled (user can fix and retry)
await expect(saveButton).toBeEnabled();

// # Test the cancel functionality
await cancelButton.click();

// * Verify email reverts to original value
await expect(systemEmailInput).toHaveValue(originalEmail);
await expect(emailInput).toHaveValue(originalEmail);

// * Verify error message disappears
await expect(errorMessage).not.toBeVisible();
// * Verify validation error disappears
await expect(fieldError).not.toBeVisible();

// * Verify Cancel button disappears
await expect(cancelButton).not.toBeVisible();

// * Verify Save button becomes disabled
// * Verify Save button remains disabled (no unsaved changes)
await expect(saveButton).toBeDisabled();
});

test('Should validate invalid URL and show error with cancel option', async () => {
// # Find custom URL field (Personal Website)
const urlInput = systemConsolePage.page.locator('input[type="url"]').first();
// # Find custom URL field (Personal Website) by its label
const websiteLabel = systemConsolePage.page.locator('label').filter({hasText: /Personal Website/});
const urlInput = websiteLabel.locator('input[type="url"]').first();
const originalUrl = await urlInput.inputValue();

// # Enter invalid URL (specifically the one mentioned: "<%>")
await urlInput.clear();
await urlInput.fill('<%>');

// # Click Save button
const saveButton = systemConsolePage.page.locator('[data-testid="saveSetting"]');
await expect(saveButton).toBeEnabled();
await saveButton.click();
// * Verify inline validation error appears
const fieldError = websiteLabel.locator('.field-error');
await expect(fieldError).toBeVisible();
await expect(fieldError).toContainText('Invalid URL');

// * Verify error message appears
const errorMessage = systemConsolePage.page.locator('.error-message');
await expect(errorMessage).toBeVisible();
await expect(errorMessage).toContainText('Invalid URL');
// * Verify Save button is disabled due to validation error
const saveButton = systemConsolePage.page.locator('[data-testid="saveSetting"]');
await expect(saveButton).toBeDisabled();

// * Verify Cancel button is visible
const cancelButton = systemConsolePage.page.locator('button:has-text("Cancel")');
Expand All @@ -340,8 +353,8 @@ test.describe('System Console - Admin User Profile Editing', () => {
// * Verify URL reverts to original value
await expect(urlInput).toHaveValue(originalUrl);

// * Verify error message disappears
await expect(errorMessage).not.toBeVisible();
// * Verify validation error disappears
await expect(fieldError).not.toBeVisible();

// * Verify Cancel button disappears
await expect(cancelButton).not.toBeVisible();
Expand All @@ -356,14 +369,14 @@ test.describe('System Console - Admin User Profile Editing', () => {
await workEmailInput.clear();
await workEmailInput.fill('not-an-email-either');

// # Click Save button
const saveButton = systemConsolePage.page.locator('button:has-text("Save")');
await saveButton.click();
// * Verify inline validation error appears
const fieldError = workEmailLabel.locator('.field-error');
await expect(fieldError).toBeVisible();
await expect(fieldError).toContainText('Invalid email address');

// * Verify error message appears
const errorMessage = systemConsolePage.page.locator('.error-message');
await expect(errorMessage).toBeVisible();
await expect(errorMessage).toContainText('Invalid email address');
// * Verify Save button is disabled due to validation error
const saveButton = systemConsolePage.page.locator('[data-testid="saveSetting"]');
await expect(saveButton).toBeDisabled();

// * Verify Cancel button is available
const cancelButton = systemConsolePage.page.locator('button:has-text("Cancel")');
Expand Down Expand Up @@ -419,6 +432,10 @@ test.describe('System Console - Admin User Profile Editing', () => {
await expect(saveButton).toBeEnabled();
await saveButton.click();

// # Confirm save in the confirmation modal
await expect(systemConsolePage.page.locator('[data-testid="admin-userDetail-saveChangesModal"]')).toBeVisible();
await systemConsolePage.page.locator('#confirmModalButton').click();

// * Verify both changes were saved successfully
const errorMessage = systemConsolePage.page.locator('.error-message');
await expect(errorMessage).not.toBeVisible();
Expand Down
Loading
Loading