From d0d29965e70e8db50b720afe0c1e47bc8de58ab7 Mon Sep 17 00:00:00 2001
From: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Date: Thu, 21 May 2026 16:14:37 +0200
Subject: [PATCH] fix(test): re-login after cy.uploadContent in conflict-picker

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
---
 cypress/e2e/files/drag-n-drop.cy.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cypress/e2e/files/drag-n-drop.cy.ts b/cypress/e2e/files/drag-n-drop.cy.ts
index 811e100317b..6f648aca8d2 100644
--- a/cypress/e2e/files/drag-n-drop.cy.ts
+++ b/cypress/e2e/files/drag-n-drop.cy.ts
@@ -214,7 +214,11 @@ describe('files: Drag and Drop onto a folder row', { testIsolation: true }, () =
 
 	it('opens the conflict picker when dropping a colliding name onto a subfolder row', () => {
 		// Pre-populate the subfolder with a file the drop will collide with.
+		// cy.uploadContent internally clears session cookies, so re-login
+		// before revisiting so it matches the uploadContent > login > visit
+		// pattern used elsewhere in the suite.
 		cy.uploadContent(user, new Blob(['original']), 'text/plain', '/subfolder/collide.txt')
+		cy.login(user)
 
 		// Reload so the pre-populated file lands in the store before the drop.
 		// The drop handler reads filesStore.getNodesByPath first and only