Skip to content

fix squash e2e test#615

Merged
khaong merged 2 commits intomainfrom
gtrrz-victor/fix-broken-e2e-test
Mar 5, 2026
Merged

fix squash e2e test#615
khaong merged 2 commits intomainfrom
gtrrz-victor/fix-broken-e2e-test

Conversation

@gtrrz-victor
Copy link
Contributor

No description provided.

@gtrrz-victor gtrrz-victor requested a review from a team as a code owner March 5, 2026 03:19
Copilot AI review requested due to automatic review settings March 5, 2026 03:19
@cursor
Copy link

cursor bot commented Mar 5, 2026

PR Summary

Low Risk
E2E test-only change that adjusts expectations and messaging checks without modifying production logic.

Overview
Updates TestResumeSquashMergeMultipleCheckpoints to reflect new entire resume behavior when a squash-merge commit contains multiple Entire-Checkpoint trailers: it should restore only the most recent checkpoint (by CreatedAt) and report that older checkpoints were skipped.

The test assertions for both GitHub and git merge --squash message formats are changed from expecting “Restored 2 sessions” to checking for the “older checkpoints skipped” output, and the test description/comments are aligned accordingly.

Written by Cursor Bugbot for commit 4927cb3. Configure here.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes the TestResumeSquashMergeMultipleCheckpoints e2e test to match the current behavior of entire resume when encountering squash-merged commits with multiple checkpoint trailers. The production code (resume.go) was updated (in a prior change) to restore only the latest checkpoint (by CreatedAt timestamp) instead of all checkpoints, but the e2e test expectations still asserted the old "Restored 2 sessions" output.

Changes:

  • Updated the TestResumeSquashMergeMultipleCheckpoints function doc comment to reflect the new behavior (restore only the latest checkpoint).
  • Updated both squash merge format assertions to check for "older checkpoints skipped" instead of "Restored 2 sessions".

@gtrrz-victor gtrrz-victor force-pushed the gtrrz-victor/fix-broken-e2e-test branch from dc804e6 to 4927cb3 Compare March 5, 2026 04:42
@khaong khaong merged commit 039fdff into main Mar 5, 2026
3 checks passed
@khaong khaong deleted the gtrrz-victor/fix-broken-e2e-test branch March 5, 2026 04:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants