Repository navigation
Conversation
4 of 7 tasks
Deploying drive-web with
|
| Latest commit: |
d6191a4
|
| Status: | ⚡️ Build in progress... |
terrerox
added this pull request to stack #2151
September 11, 2026 05:44
terrerox
force-pushed
the
feat/skip-item-option-in-name-collision
branch
from
September 15, 2026 03:33
890333f to
c327fed
Compare
terrerox
force-pushed
the
test/name-collision-skip-e2e
branch
from
September 15, 2026 03:33
ac46f0e to
0a5c069
Compare
CandelR
previously approved these changes
Sep 18, 2026
terrerox
dismissed
CandelR’s stale review
September 27, 2026 23:57
The merge-base changed after approval.
terrerox
force-pushed
the
feat/skip-item-option-in-name-collision
branch
from
September 27, 2026 23:57
c327fed to
dec3bf9
Compare
terrerox
force-pushed
the
test/name-collision-skip-e2e
branch
2 times, most recently
from
September 30, 2026 02:25
9bc8569 to
0207ead
Compare
terrerox
force-pushed
the
feat/skip-item-option-in-name-collision
branch
2 times, most recently
from
October 7, 2026 01:03
8be0b5a to
c4b1f37
Compare
terrerox
force-pushed
the
test/name-collision-skip-e2e
branch
from
October 7, 2026 03:30
0207ead to
b794a53
Compare
Covers single and multiple duplicates, per-item and apply-to-all skipping, non-conflicting files still uploading, and Replace trashing the matching file, with auth, bootstrap and Drive endpoints mocked so the specs run without a backend. Queued uploads are asserted through the task panel because Playwright cannot intercept the bridge in Firefox.
Skipping a colliding folder upload now keeps the existing folder and uploads only the files and subfolders that do not exist yet, merging colliding subfolders recursively so the folder structure is preserved.
Covers keep both for files and folders, replacing a folder, merging a skipped folder into the existing one, replace, keep both and skip for moved files, and versioned replace. The Drive mock now tracks folders, folder creation, moves and a versioning flag; moves are driven by dispatching the HTML5 drag events on the row's drop zone.
terrerox
force-pushed
the
test/name-collision-skip-e2e
branch
from
October 7, 2026 13:25
b794a53 to
4b0a43e
Compare
terrerox
removed this pull request from stack #2151
October 7, 2026 13:28
…restore-e2e [PB-6531]: e2e coverage for same-name restore collisions
…atch [PB-6531]: resolve same-name items within a move collision batch
…ge-on-skip [PB-6531]: merge folder uploads into the existing folder on skip
terrerox
merged commit Oct 7, 2026
53ac5f2
into
feat/skip-item-option-in-name-collision
1 of 3 checks passed
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Stacked on #2039. Playwright coverage for the Skip option: single and multiple duplicates, per-item vs. "apply to all", non-conflicting files still uploading while the dialog is open, and Replace trashing the matching file.
Auth, bootstrap and Drive endpoints are mocked so the specs run without a backend. The Drive mock is an in-memory list of files that answers listings and duplicate checks per folder and records trash and bridge requests; trashing removes the item so follow-up checks see the new state. Queued uploads are asserted through the task panel (a
data-testhook on the panel) rather than bridge requests, because Playwright cannot intercept the bridge's CORS preflight in Firefox.Also extracts the login mocks from the login spec into
authRouteMocks.tsso both specs share them.Related Issues
Related Pull Requests
Checklist
Testing Process
yarn playwright test test/e2e/tests/specs/DRIVE-internxt-name-collision-skip.spec.ts --project "Internxt E2E tests on chromium"with the dev server running.