Skip to content

Fix the dialog warnings test failing on master - #755

Merged
goneng merged 1 commit into
masterfrom
register-force-push-dialog-warning
Oct 3, 2026
Merged

goneng merged 1 commit into
masterfrom
register-force-push-dialog-warning

Conversation

@goneng

@goneng goneng commented Oct 3, 2026 •

Copy link
Copy Markdown
Collaborator

Fix CI-tests - the failing dialog warnings test on master -
by registering the force push with lease dialog in the Preferences' Warnings list.

  • Add a kDialogForcePushWithLease constant and use it in
    PBGitWindowController instead of the string literal.
  • Add the dialog to +[PBGitDefaults dialogWarnings] with a title and a
    description.

Test plan:

  • PBDialogWarningTests passes locally, including
    testEverySuppressibleDialogIsRegistered, which fails on master.
  • The new title and description appear in the Warnings list in
    Preferences; not checked by eye.

List the force push with lease dialog in the Preferences warnings, so
the test that every suppressible dialog is registered passes again.

- Add a kDialogForcePushWithLease constant and use it at the call site.
- Register the dialog with a title and description in dialogWarnings.
- The two pull requests that introduced the dialog and the test were
  each green alone, and failed once both were merged.
@goneng
goneng marked this pull request as ready for review October 3, 2026 15:14
@goneng goneng added bugfix test Test related labels Oct 3, 2026
@goneng

goneng commented Oct 3, 2026 •

Copy link
Copy Markdown
Collaborator Author

@hannesa2, this PR fixes the test target that broke because of a collision between PRs #749 and #750.
It makes master green again.

@goneng

goneng commented Oct 3, 2026

Copy link
Copy Markdown
Collaborator Author

@hannesa2 - CI is fixed - please merge

@goneng

goneng commented Oct 3, 2026

Copy link
Copy Markdown
Collaborator Author

@hannesa2 - I'm taking the liberty to merge this fix to stabilize the CI

@goneng
goneng merged commit b3e9e38 into master Oct 3, 2026
3 checks passed
@goneng
goneng deleted the register-force-push-dialog-warning branch October 3, 2026 16:24
@hannesa2

hannesa2 commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

@hannesa2 - I'm taking the liberty to merge this fix to stabilize the CI

When you think it's fine: do it !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix test Test related

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants