diff --git a/cypress/e2e/audio.mpeg.cy.js b/cypress/e2e/audio.mpeg.cy.js index 9680391d8..cb5176f88 100644 --- a/cypress/e2e/audio.mpeg.cy.js +++ b/cypress/e2e/audio.mpeg.cy.js @@ -41,7 +41,7 @@ describe('Open audio.mp3 in viewer', function() { }) it('See audio.mp3 in the list', function() { - cy.get('#fileList tr[data-file="audio.mp3"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="audio.mp3"]', { timeout: 10000 }) .should('contain', 'audio.mp3') }) diff --git a/cypress/e2e/audio.ogg.cy.js b/cypress/e2e/audio.ogg.cy.js index 1df1ec7ba..98c0752b1 100644 --- a/cypress/e2e/audio.ogg.cy.js +++ b/cypress/e2e/audio.ogg.cy.js @@ -41,7 +41,7 @@ describe('Open audio.ogg in viewer', function() { }) it('See audio.ogg in the list', function() { - cy.get('#fileList tr[data-file="audio.ogg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="audio.ogg"]', { timeout: 10000 }) .should('contain', 'audio.ogg') }) diff --git a/cypress/e2e/audios.cy.js b/cypress/e2e/audios.cy.js index 13aafc2a9..ca2c9fc94 100644 --- a/cypress/e2e/audios.cy.js +++ b/cypress/e2e/audios.cy.js @@ -42,9 +42,9 @@ describe('Open mp3 and ogg audio in viewer', function() { }) it('See audios in the list', function() { - cy.get('#fileList tr[data-file="audio.mp3"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="audio.mp3"]', { timeout: 10000 }) .should('contain', 'audio.mp3') - cy.get('#fileList tr[data-file="audio.ogg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="audio.ogg"]', { timeout: 10000 }) .should('contain', 'audio.ogg') }) diff --git a/cypress/e2e/delete.cy.js b/cypress/e2e/delete.cy.js index 93ef3614c..47cdbfc19 100644 --- a/cypress/e2e/delete.cy.js +++ b/cypress/e2e/delete.cy.js @@ -41,7 +41,7 @@ describe('Delete image.png in viewer', function() { }) it('See image.png in the list', function() { - cy.get('#fileList tr[data-file="image.png"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image.png"]', { timeout: 10000 }) .should('contain', 'image.png') }) @@ -71,7 +71,7 @@ describe('Delete image.png in viewer', function() { it('Does not see image.png in the list anymore', function() { cy.visit('/apps/files') - cy.get('#fileList tr[data-file="image.png"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image.png"]', { timeout: 10000 }) .should('not.exist') }) }) diff --git a/cypress/e2e/download-share-disabled.cy.js b/cypress/e2e/download-share-disabled.cy.js index 8ee68c043..0077b4ac0 100644 --- a/cypress/e2e/download-share-disabled.cy.js +++ b/cypress/e2e/download-share-disabled.cy.js @@ -48,15 +48,15 @@ describe(`Download ${fileName} in viewer`, function() { }) it('See the default files list', function() { - cy.get('#fileList tr').should('contain', 'welcome.txt') - cy.get('#fileList tr').should('contain', 'Photos') + cy.get('.files-fileList tr').should('contain', 'welcome.txt') + cy.get('.files-fileList tr').should('contain', 'Photos') }) it('See shared files in the list', function() { cy.openFile('Photos') - cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) .should('contain', 'image1.jpg') - cy.get('#fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) .should('contain', 'image2.jpg') }) @@ -64,7 +64,7 @@ describe(`Download ${fileName} in viewer`, function() { cy.createLinkShare('/Photos').then(token => { // Open the sidebar cy.visit('/apps/files') - cy.get('#fileList tr[data-file="Photos"] .fileactions .action-share', { timeout: 10000 }).click() + cy.get('.files-fileList tr[data-file="Photos"] .fileactions .action-share', { timeout: 10000 }).click() cy.get('aside.app-sidebar').should('be.visible') // Open the share menu diff --git a/cypress/e2e/download-share.cy.js b/cypress/e2e/download-share.cy.js index a81bb9bc6..5e6740bc2 100644 --- a/cypress/e2e/download-share.cy.js +++ b/cypress/e2e/download-share.cy.js @@ -47,15 +47,15 @@ describe(`Download ${fileName} from viewer in link share`, function() { }) it('See the default files list', function() { - cy.get('#fileList tr').should('contain', 'welcome.txt') - cy.get('#fileList tr').should('contain', 'Photos') + cy.get('.files-fileList tr').should('contain', 'welcome.txt') + cy.get('.files-fileList tr').should('contain', 'Photos') }) it('See shared files in the list', function() { cy.openFile('Photos') - cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) .should('contain', 'image1.jpg') - cy.get('#fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) .should('contain', 'image2.jpg') }) diff --git a/cypress/e2e/download.cy.js b/cypress/e2e/download.cy.js index 609fcf755..6dfe191fc 100644 --- a/cypress/e2e/download.cy.js +++ b/cypress/e2e/download.cy.js @@ -45,7 +45,7 @@ describe(`Download ${fileName} in viewer`, function() { }) it(`See "${fileName}" in the list`, function() { - cy.get(`#fileList tr[data-file="${fileName}"]`, { timeout: 10000 }) + cy.get(`.files-fileList tr[data-file="${fileName}"]`, { timeout: 10000 }) .should('contain', fileName) }) diff --git a/cypress/e2e/files-shares.cy.js b/cypress/e2e/files-shares.cy.js index 45089bab1..6a98c6870 100644 --- a/cypress/e2e/files-shares.cy.js +++ b/cypress/e2e/files-shares.cy.js @@ -47,21 +47,21 @@ describe('See shared folder with link share', function() { }) it('See the default files list', function() { - cy.get('#fileList tr').should('contain', 'welcome.txt') - cy.get('#fileList tr').should('contain', 'Photos') + cy.get('.files-fileList tr').should('contain', 'welcome.txt') + cy.get('.files-fileList tr').should('contain', 'Photos') }) it('See shared files in the list', function() { cy.openFile('Photos') - cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) .should('contain', 'image1.jpg') - cy.get('#fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) .should('contain', 'image2.jpg') - cy.get('#fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) .should('contain', 'image3.jpg') - cy.get('#fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) .should('contain', 'image4.jpg') - cy.get('#fileList tr[data-file="video1.mp4"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="video1.mp4"]', { timeout: 10000 }) .should('contain', 'video1.mp4') }) diff --git a/cypress/e2e/files.cy.js b/cypress/e2e/files.cy.js index e1e1c31bf..b927542db 100644 --- a/cypress/e2e/files.cy.js +++ b/cypress/e2e/files.cy.js @@ -29,7 +29,7 @@ describe('Files default view', function() { }) it('See the default files list', function() { - cy.get('#fileList tr').should('contain', 'welcome.txt') + cy.get('.files-fileList tr').should('contain', 'welcome.txt') }) it('Take screenshot', function() { diff --git a/cypress/e2e/image-small.png.cy.js b/cypress/e2e/image-small.png.cy.js index ad97c9260..c4162367e 100644 --- a/cypress/e2e/image-small.png.cy.js +++ b/cypress/e2e/image-small.png.cy.js @@ -41,7 +41,7 @@ describe('Open image-small.png in viewer', function() { }) it('See image-small.png in the list', function() { - cy.get('#fileList tr[data-file="image-small.png"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image-small.png"]', { timeout: 10000 }) .should('contain', 'image-small.png') }) diff --git a/cypress/e2e/image.gif.cy.js b/cypress/e2e/image.gif.cy.js index 32df57273..140e6d1ec 100644 --- a/cypress/e2e/image.gif.cy.js +++ b/cypress/e2e/image.gif.cy.js @@ -42,7 +42,7 @@ describe('Open image.gif in viewer', function() { }) it('See image.gif in the list', function() { - cy.get('#fileList tr[data-file="image.gif"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image.gif"]', { timeout: 10000 }) .should('contain', 'image.gif') }) diff --git a/cypress/e2e/image.png.cy.js b/cypress/e2e/image.png.cy.js index afb67cead..53761de1e 100644 --- a/cypress/e2e/image.png.cy.js +++ b/cypress/e2e/image.png.cy.js @@ -41,7 +41,7 @@ describe('Open image.png in viewer', function() { }) it('See image.png in the list', function() { - cy.get('#fileList tr[data-file="image.png"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image.png"]', { timeout: 10000 }) .should('contain', 'image.png') }) diff --git a/cypress/e2e/image.svg.cy.js b/cypress/e2e/image.svg.cy.js index 0dbaf75c0..f7859419d 100644 --- a/cypress/e2e/image.svg.cy.js +++ b/cypress/e2e/image.svg.cy.js @@ -42,7 +42,7 @@ describe('Open image.svg in viewer', function() { }) it('See image.svg in the list', function() { - cy.get('#fileList tr[data-file="image.svg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image.svg"]', { timeout: 10000 }) .should('contain', 'image.svg') }) diff --git a/cypress/e2e/image.webp.cy.js b/cypress/e2e/image.webp.cy.js index 234e0a775..907574435 100644 --- a/cypress/e2e/image.webp.cy.js +++ b/cypress/e2e/image.webp.cy.js @@ -41,7 +41,7 @@ describe('Open image.webp in viewer', function() { }) it('See image.webp in the list', function() { - cy.get('#fileList tr[data-file="image.webp"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image.webp"]', { timeout: 10000 }) .should('contain', 'image.webp') }) diff --git a/cypress/e2e/images-custom-list-loadmore.cy.js b/cypress/e2e/images-custom-list-loadmore.cy.js index 35b6a73ee..85cc2bd44 100644 --- a/cypress/e2e/images-custom-list-loadmore.cy.js +++ b/cypress/e2e/images-custom-list-loadmore.cy.js @@ -44,13 +44,13 @@ describe('Open custom list of images in viewer with pagination', function() { }) it('See images in the list', function() { - cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) .should('contain', 'image1.jpg') - cy.get('#fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) .should('contain', 'image2.jpg') - cy.get('#fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) .should('contain', 'image3.jpg') - cy.get('#fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) .should('contain', 'image4.jpg') }) diff --git a/cypress/e2e/images-custom-list.cy.js b/cypress/e2e/images-custom-list.cy.js index 7233b7a79..85d667762 100644 --- a/cypress/e2e/images-custom-list.cy.js +++ b/cypress/e2e/images-custom-list.cy.js @@ -44,13 +44,13 @@ describe('Open custom images list in viewer', function() { }) it('See images in the list', function() { - cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) .should('contain', 'image1.jpg') - cy.get('#fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) .should('contain', 'image2.jpg') - cy.get('#fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) .should('contain', 'image3.jpg') - cy.get('#fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) .should('contain', 'image4.jpg') }) @@ -125,7 +125,7 @@ describe('Open custom images list in viewer', function() { .and('not.have.class', 'icon-loading') }) - it('See the menu icon and title on the viewer header', function() { + it('See the menu icon and title on the viewer header', function() { cy.get('body > .viewer .modal-title').should('contain', 'image3.jpg') cy.get('body > .viewer .modal-header button.action-item__menutoggle').should('be.visible') cy.get('body > .viewer .modal-header button.header-close').should('be.visible') diff --git a/cypress/e2e/images.cy.js b/cypress/e2e/images.cy.js index 5ef2f37d8..f656a3afd 100644 --- a/cypress/e2e/images.cy.js +++ b/cypress/e2e/images.cy.js @@ -44,13 +44,13 @@ describe('Open images in viewer', function() { }) it('See images in the list', function() { - cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) .should('contain', 'image1.jpg') - cy.get('#fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) .should('contain', 'image2.jpg') - cy.get('#fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) .should('contain', 'image3.jpg') - cy.get('#fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) .should('contain', 'image4.jpg') }) diff --git a/cypress/e2e/oddname/oddname.js b/cypress/e2e/oddname/oddname.js index 95fed2875..f4d79f12b 100644 --- a/cypress/e2e/oddname/oddname.js +++ b/cypress/e2e/oddname/oddname.js @@ -109,7 +109,7 @@ export default function(file, type) { } it(`See ${file} as ${placedName} in the list`, function() { - cy.get(`#fileList tr[data-file="${placedNameCss}"]`, { + cy.get(`.files-fileList tr[data-file="${placedNameCss}"]`, { timeout: 10000, }).should('contain', placedName) }) diff --git a/cypress/e2e/sidebar.cy.js b/cypress/e2e/sidebar.cy.js index 3675e140b..054c538a1 100644 --- a/cypress/e2e/sidebar.cy.js +++ b/cypress/e2e/sidebar.cy.js @@ -45,13 +45,13 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already }) it('See images in the list', function() { - cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image1.jpg"]', { timeout: 10000 }) .should('contain', 'image1.jpg') - cy.get('#fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image2.jpg"]', { timeout: 10000 }) .should('contain', 'image2.jpg') - cy.get('#fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image3.jpg"]', { timeout: 10000 }) .should('contain', 'image3.jpg') - cy.get('#fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="image4.jpg"]', { timeout: 10000 }) .should('contain', 'image4.jpg') }) @@ -134,7 +134,7 @@ describe('Open the sidebar from the viewer and open viewer with sidebar already cy.get('body > .viewer').should('not.exist') // open the sidebar without viewer open - cy.get('#fileList tr[data-file="image1.jpg"] .date .modified').click() + cy.get('.files-fileList tr[data-file="image1.jpg"] .date .modified').click() cy.openFile('image1.jpg') cy.get('body > .viewer', { timeout: 10000 }) diff --git a/cypress/e2e/video.mkv.cy.js b/cypress/e2e/video.mkv.cy.js index c4cfc7d30..7f981c9f6 100644 --- a/cypress/e2e/video.mkv.cy.js +++ b/cypress/e2e/video.mkv.cy.js @@ -41,7 +41,7 @@ describe('Open video.mkv in viewer', function() { }) it('See video.mkv in the list', function() { - cy.get('#fileList tr[data-file="video.mkv"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="video.mkv"]', { timeout: 10000 }) .should('contain', 'video.mkv') }) diff --git a/cypress/e2e/video.mp4.cy.js b/cypress/e2e/video.mp4.cy.js index 4bd34b955..e98e9b87a 100644 --- a/cypress/e2e/video.mp4.cy.js +++ b/cypress/e2e/video.mp4.cy.js @@ -41,7 +41,7 @@ describe('Open video1.mp4 in viewer', function() { }) it('See video1.mp4 in the list', function() { - cy.get('#fileList tr[data-file="video1.mp4"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="video1.mp4"]', { timeout: 10000 }) .should('contain', 'video1.mp4') }) diff --git a/cypress/e2e/video.ogv.cy.js b/cypress/e2e/video.ogv.cy.js index c401bb2ca..a4ed5b684 100644 --- a/cypress/e2e/video.ogv.cy.js +++ b/cypress/e2e/video.ogv.cy.js @@ -41,7 +41,7 @@ describe('Open video.ogv in viewer', function() { }) it('See video.ogv in the list', function() { - cy.get('#fileList tr[data-file="video.ogv"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="video.ogv"]', { timeout: 10000 }) .should('contain', 'video.ogv') }) diff --git a/cypress/e2e/video.webm.cy.js b/cypress/e2e/video.webm.cy.js index 341cfee0c..8ad4ad0e1 100644 --- a/cypress/e2e/video.webm.cy.js +++ b/cypress/e2e/video.webm.cy.js @@ -41,7 +41,7 @@ describe('Open video.webm in viewer', function() { }) it('See video.webm in the list', function() { - cy.get('#fileList tr[data-file="video.webm"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="video.webm"]', { timeout: 10000 }) .should('contain', 'video.webm') }) diff --git a/cypress/e2e/videos.cy.js b/cypress/e2e/videos.cy.js index 98801f293..bebd3c486 100644 --- a/cypress/e2e/videos.cy.js +++ b/cypress/e2e/videos.cy.js @@ -42,9 +42,9 @@ describe('Open mp4 videos in viewer', function() { }) it('See videos in the list', function() { - cy.get('#fileList tr[data-file="video1.mp4"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="video1.mp4"]', { timeout: 10000 }) .should('contain', 'video1.mp4') - cy.get('#fileList tr[data-file="video2.mp4"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="video2.mp4"]', { timeout: 10000 }) .should('contain', 'video2.mp4') }) diff --git a/cypress/e2e/visual-regression.cy.js b/cypress/e2e/visual-regression.cy.js index 48f1dc569..55e911d3b 100644 --- a/cypress/e2e/visual-regression.cy.js +++ b/cypress/e2e/visual-regression.cy.js @@ -42,9 +42,9 @@ describe('Visual regression tests ', function() { }) it('See files in the list', function() { - cy.get('#fileList tr[data-file="test-card.mp4"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="test-card.mp4"]', { timeout: 10000 }) .should('contain', 'test-card.mp4') - cy.get('#fileList tr[data-file="test-card.png"]', { timeout: 10000 }) + cy.get('.files-fileList tr[data-file="test-card.png"]', { timeout: 10000 }) .should('contain', 'test-card.png') }) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index a7df339b9..175187f04 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -111,26 +111,26 @@ Cypress.Commands.add('uploadFile', (fixtureFileName, mimeType, path = '', upload }) Cypress.Commands.add('createFolder', dirName => { - cy.get('#controls .actions > .button.new').click() - cy.get('#controls .actions .newFileMenu a[data-action="folder"]').click() - cy.get('#controls .actions .newFileMenu a[data-action="folder"] input[type="text"]').type(dirName) - cy.get('#controls .actions .newFileMenu a[data-action="folder"] input.icon-confirm').click() + cy.get('.files-controls .actions > .button.new').click() + cy.get('.files-controls .actions .newFileMenu a[data-action="folder"]').click() + cy.get('.files-controls .actions .newFileMenu a[data-action="folder"] input[type="text"]').type(dirName) + cy.get('.files-controls .actions .newFileMenu a[data-action="folder"] input.icon-confirm').click() cy.log('Created folder', dirName) }) Cypress.Commands.add('openFile', fileName => { - cy.get(`#fileList tr[data-file="${CSS.escape(fileName)}"] a.name`).click() + cy.get(`.files-fileList tr[data-file="${CSS.escape(fileName)}"] a.name`).click() cy.wait(250) }) Cypress.Commands.add('getFileId', fileName => { - return cy.get(`#fileList tr[data-file="${CSS.escape(fileName)}"]`) + return cy.get(`.files-fileList tr[data-file="${CSS.escape(fileName)}"]`) .should('have.attr', 'data-id') }) Cypress.Commands.add('deleteFile', fileName => { - cy.get(`#fileList tr[data-file="${CSS.escape(fileName)}"] a.name .action-menu`).click() - cy.get(`#fileList tr[data-file="${CSS.escape(fileName)}"] a.name + .popovermenu .action-delete`).click() + cy.get(`.files-fileList tr[data-file="${CSS.escape(fileName)}"] a.name .action-menu`).click() + cy.get(`.files-fileList tr[data-file="${CSS.escape(fileName)}"] a.name + .popovermenu .action-delete`).click() }) /** @@ -170,4 +170,4 @@ Cypress.Commands.overwrite('compareSnapshot', (originalFn, subject, name, option } }) return originalFn(subject, name, options) -}) \ No newline at end of file +})