From 53f6566bd6096ed62b5feeed7050296920bb6986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 2 Nov 2023 22:46:03 +0100 Subject: [PATCH 1/2] Revert "ci: Skip failing link to directory test" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7020248b4b883b4184ce0f2db41f709216969517. Signed-off-by: Julius Härtl --- cypress/e2e/nodes/Links.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/nodes/Links.spec.js b/cypress/e2e/nodes/Links.spec.js index 23d406dcfc0..82d09272d47 100644 --- a/cypress/e2e/nodes/Links.spec.js +++ b/cypress/e2e/nodes/Links.spec.js @@ -170,7 +170,7 @@ describe('test link marks', function() { cy.get('.modal-name').should('include.text', fileName) }) }) - it.skip('link to directory', () => { + it('link to directory', () => { cy.createFolder(`${window.__currentDirectory}/dummy folder`) cy.getFile(fileName).then($el => { cy.getContent().type(`${text}{selectAll}`) From ce3871e453fc04776cf396783e27a6e541ae1c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 28 Nov 2023 09:12:18 +0100 Subject: [PATCH 2/2] ci: Fix selecting a folder in the file picker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- cypress/e2e/nodes/Links.spec.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/nodes/Links.spec.js b/cypress/e2e/nodes/Links.spec.js index 82d09272d47..43636f75a16 100644 --- a/cypress/e2e/nodes/Links.spec.js +++ b/cypress/e2e/nodes/Links.spec.js @@ -140,11 +140,12 @@ describe('test link marks', function() { describe('link to local file', function() { // Helper to reduce duplicated code, checking inserting with and without selected text - const checkLinkFile = (filename, text) => { + const checkLinkFile = (filename, text, isFolder = false) => { cy.getSubmenuEntry('insert-link', 'insert-link-file').click() cy.get('.file-picker').within(() => { - cy.get(`[data-testid="file-list-row"][data-filename="${fileName}"]`).click() - cy.contains('button', `Choose ${fileName}`).click() + cy.get(`[data-testid="file-list-row"][data-filename="${filename}"]`).click() + cy.get(isFolder ? '.empty-content__name' : '.file-picker__files') + cy.contains('button', isFolder ? 'Choose' : `Choose ${filename}`).click() }) return cy.getContent() @@ -174,7 +175,7 @@ describe('test link marks', function() { cy.createFolder(`${window.__currentDirectory}/dummy folder`) cy.getFile(fileName).then($el => { cy.getContent().type(`${text}{selectAll}`) - checkLinkFile('dummy folder', text) + checkLinkFile('dummy folder', text, true) cy.get('@winOpen') .should('have.been.calledOnce') })