Skip to content

[PB-6531]: e2e coverage for same-name restore collisions - #2160

Merged
terrerox merged 4 commits into
fix/name-collision-same-name-batchfrom
test/name-collision-same-name-restore-e2e
Oct 7, 2026
Merged

terrerox merged 4 commits into
fix/name-collision-same-name-batchfrom
test/name-collision-same-name-restore-e2e

Conversation

@terrerox

@terrerox terrerox commented Sep 20, 2026 •

Copy link
Copy Markdown
Contributor

Description

E2E tests for restoring same-name files from the trash into a folder that already has that name. They go through the real flow (Trash → select all → Restore → collision dialog) and then check what the user sees in the folder and in the trash.

  • TC9 / TC10: keep both and replace with "apply to all".
  • TC11: a file whose move fails stays in the trash.
  • TC12 / TC13: resolving one by one (replace → replace, keep both → replace).

All of them fail without the fix in #2159.

The Drive mock now has a trash and keeps its state after moving or trashing a file, so the next listing sees the change.

Related Issues

Related Pull Requests

Checklist

  • Changes have been tested locally.
  • Unit tests have been written or updated as necessary.
  • The code adheres to the repository's coding standards.
  • Relevant documentation has been added or updated.
  • No new warnings or errors have been introduced.
  • SonarCloud issues have been reviewed and addressed.
  • QA Passed

Testing Process

@terrerox
terrerox added this pull request to stack #2151 September 20, 2026 22:44
@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Sep 20, 2026 •

Copy link
Copy Markdown

Deploying drive-web with  Cloudflare Pages  Cloudflare Pages

Latest commit: f549f92
Status: ✅  Deploy successful!
Preview URL: https://9c431a35.drive-web.pages.dev
Branch Preview URL: https://test-name-collision-same-nam.drive-web.pages.dev

View logs

CandelR
CandelR previously approved these changes Sep 22, 2026
@terrerox
terrerox force-pushed the test/name-collision-same-name-restore-e2e branch from f6d6224 to e1d83a0 Compare September 28, 2026 00:52
@terrerox
terrerox force-pushed the fix/name-collision-same-name-batch branch from 49b9660 to b3e86e1 Compare September 28, 2026 00:52
@terrerox
terrerox force-pushed the test/name-collision-same-name-restore-e2e branch from e1d83a0 to 3f8e5d2 Compare September 30, 2026 02:25
@terrerox
terrerox force-pushed the fix/name-collision-same-name-batch branch from 720b538 to 86dfb97 Compare October 7, 2026 03:30
@terrerox
terrerox force-pushed the test/name-collision-same-name-restore-e2e branch from 3f8e5d2 to 838c2d3 Compare October 7, 2026 03:30
@terrerox
terrerox force-pushed the test/name-collision-same-name-restore-e2e branch from 838c2d3 to f9e798b Compare October 7, 2026 13:25
@terrerox
terrerox removed this pull request from stack #2151 October 7, 2026 13:28
@terrerox
terrerox force-pushed the test/name-collision-same-name-restore-e2e branch from 838c2d3 to f9e798b Compare October 7, 2026 13:32
@sonarqubecloud

sonarqubecloud Bot commented Oct 7, 2026

Copy link
Copy Markdown

@terrerox
terrerox merged commit 8b4af77 into fix/name-collision-same-name-batch Oct 7, 2026
4 of 5 checks passed
@terrerox
terrerox deleted the test/name-collision-same-name-restore-e2e branch October 7, 2026 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants