Skip to content

[pull] master from mattermost:master #717

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 1 commit into from
May 20, 2026
Merged

[pull] master from mattermost:master #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions e2e-tests/cypress/cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ export default defineConfig({
viewportWidth: 1300,
allowCypressEnv: false,
expose: {
adminEmail: 'sysadmin@sample.mattermost.com',
adminUsername: 'sysadmin',
adminPassword: 'Sys@dmin-sample1',
adminEmail: process.env.CYPRESS_adminEmail || 'sysadmin@sample.mattermost.com',
adminUsername: process.env.CYPRESS_adminUsername || 'sysadmin',
adminPassword: process.env.CYPRESS_adminPassword || 'Sys@dmin-sample1',
allowedUntrustedInternalConnections: 'localhost',
cwsURL: 'http://localhost:8076',
cwsAPIURL: 'http://localhost:8076',
Expand Down
13 changes: 9 additions & 4 deletions e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_image_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@ describe('Verify Accessibility Support in Different Images', () => {
let otherUser;

before(() => {
cy.apiInitSetup().then(({offTopicUrl, user}) => {
otherUser = user;
cy.apiInitSetup().then(({team, offTopicUrl, user}) => {
cy.apiCreateUser({prefix: 'other'}).then(({user: user1}) => {
otherUser = user1;
return cy.apiAddUserToTeam(team.id, otherUser.id);
}).then(() => {
cy.apiLogin(user);

// Visit the Off Topic channel
cy.visit(offTopicUrl);
// Visit the Off Topic channel
cy.visit(offTopicUrl);
});
});
});

Expand Down
1 change: 1 addition & 0 deletions e2e-tests/cypress/tests/support/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ function sysadminSetup(user) {

function resetUserPreference(userId) {
cy.apiSaveTeammateNameDisplayPreference('username');
cy.apiSaveMessageDisplayPreference('clean');
cy.apiSaveLinkPreviewsPreference('true');
cy.apiSaveCollapsePreviewsPreference('false');
cy.apiSaveClockDisplayModeTo24HourPreference(false);
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/playwright/specs/functional/system_console/system_users/column_sort.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test.describe('System Console - Users table sorting', () => {
}
expect(emails.length).toBeGreaterThan(3);

const sorted = [...emails].sort((a, b) => a.localeCompare(b));
const sorted = [...emails].sort((a, b) => a.localeCompare(b, undefined, {ignorePunctuation: true}));
if (sortDirection === 'descending') {
sorted.reverse();
}
Expand Down Expand Up @@ -81,7 +81,7 @@ test.describe('System Console - Users table sorting', () => {
}
expect(emails.length).toBeGreaterThan(3);

const sorted = [...emails].sort((a, b) => a.localeCompare(b));
const sorted = [...emails].sort((a, b) => a.localeCompare(b, undefined, {ignorePunctuation: true}));
if (reversedDirection === 'descending') {
sorted.reverse();
}
Expand Down
Loading