Skip to content

[CP-stable] Migrate Safari tests to macOS 26 - #195437

Merged
auto-submit[bot] merged 1 commit into
flutter:flutter-3.47-candidate.0from
vashworth:cp_3.47_pr_193681_v2
Oct 27, 2026
Merged

auto-submit[bot] merged 1 commit into
flutter:flutter-3.47-candidate.0from
vashworth:cp_3.47_pr_193681_v2

Conversation

@vashworth

Copy link
Copy Markdown
Contributor

Issue Link:

What is the link to the issue this cherry-pick is addressing?

#193833, #193834

Impact Description:

What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)?
Does it impact development (ex. flutter doctor crashes when Android Studio is installed),
or the shipping of production apps (the app crashes on launch).
This information is for domain experts and release engineers to understand the consequences of saying yes or no to the cherry pick.

CI test-only change to migrate tests to macOS 26. This is a partial cherry-pick of #193681, only including the parts required for macOS 26.

Changelog Description:

Explain this cherry pick:

  • In one line that is accessible to most Flutter developers.
  • That describes the state prior to the fix.
  • That includes which platforms are impacted.
    See best practices for examples.

N/A - CI test-only change

Workaround:

Is there a workaround for this issue?

Rerun test

Risk:

What is the risk level of this cherry-pick?

  • Low
  • Medium
  • High

Test Coverage:

Are you confident that your fix is well-tested by automated tests?

  • Yes
  • No

Validation Steps:

What are the steps to validate that this fix works?

Run in CI

@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Oct 27, 2026
@flutter-dashboard

Copy link
Copy Markdown

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the macOS builder environment version from Mac-15.7 to Mac-26.6 and adjusts Safari-specific test assertions in text_editing_test.dart and style_manager_test.dart to handle rendering differences. Feedback on the changes suggests simplifying the assertion in style_manager_test.dart by always allowing the unfocused outline value on Safari, which avoids potential test flakiness introduced by dynamically checking domDocument.hasFocus().

// In WebKit, `:focus` does not match when the Safari window lacks
// OS-level WindowServer focus (`!domDocument.hasFocus()`), returning
// the initial unfocused outline width (`medium` = `3px`) with `none`.
if (isSafari && !domDocument.hasFocus()) '3px none rgb(0, 0, 0)',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Checking domDocument.hasFocus() dynamically during test initialization can introduce flakiness. If the OS window focus changes during the test run or if there is a race condition, the test might fail because the expected list was constructed based on an outdated focus state. It is more robust to always allow the unfocused outline value ('3px none rgb(0, 0, 0)') on Safari, regardless of the instantaneous focus state of the document.

Suggested change
if (isSafari && !domDocument.hasFocus()) '3px none rgb(0, 0, 0)',
if (isSafari) '3px none rgb(0, 0, 0)',

@github-actions github-actions Bot added a: text input Entering text in a text field or keyboard related problems engine flutter/engine related. See also e: labels. platform-web Web applications specifically team-web Owned by Web platform team labels Oct 27, 2026
@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 27, 2026
@auto-submit
auto-submit Bot merged commit 89c39ed into flutter:flutter-3.47-candidate.0 Oct 27, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: text input Entering text in a text field or keyboard related problems autosubmit Merge PR when tree becomes green via auto submit App CICD Run CI/CD cp: review Cherry-picks in the review queue engine flutter/engine related. See also e: labels. platform-web Web applications specifically team-web Owned by Web platform team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants