Skip to content

[pull] master from mattermost:master#717

Merged
pull[bot] merged 1 commit into
code:masterfrom
mattermost:master
May 20, 2026
Merged

[pull] master from mattermost:master#717
pull[bot] merged 1 commit into
code:masterfrom
mattermost:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented May 20, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

* Fix flaky email sort test by ignoring punctuation in localeCompare

PostgreSQL's en_US.UTF-8 collation ignores hyphens at the primary sort
level, but JS localeCompare() on a C-locale CI runner uses byte order,
causing the expected and actual sort orders to diverge for emails
containing hyphens. Passing ignorePunctuation:true aligns JS collation
with Postgres behavior.

* E2E/Cypress: re-enable CYPRESS_* env var overrides

allowCypressEnv: false was introduced in the v15.13 upgrade (PR #36091)
but broke the existing CYPRESS_adminUsername / CYPRESS_adminPassword
override mechanism that local and CI runners depend on.

* E2E/Cypress: fix MM-T1508 accessibility image test flakiness

The test was failing because the admin user could have a stale
compact display mode preference from a previous spec, causing
post avatars to render with pointer-events: none and blocking
the .status-wrapper click.

Two fixes:
- resetUserPreference() now resets message_display to 'clean'
  so compact mode doesn't leak across spec files
- accessibility_image_spec before() now runs as a fresh user
  with default preferences rather than the shared admin account
@pull pull Bot locked and limited conversation to collaborators May 20, 2026
@pull pull Bot added the ⤵️ pull label May 20, 2026
@pull pull Bot merged commit 41f3b22 into code:master May 20, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant