Skip to content

Commit 164bd63

Browse files
skjnldsvskjnldsv
authored
Merge pull request #1319 from nextcloud/dependencies/nextcloud-vue6
2 parents 4b360b7 + eae7895 commit 164bd63

31 files changed

Lines changed: 519 additions & 456 deletions

‎apps/viewer/apps/viewer/cypress/e2e/audio.mpeg.cy.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ describe('Open audio.mp3 in viewer', function() {
6464
})
6565

6666
it('Does not see navigation arrows', function() {
67-
cy.get('body > .viewer a.prev').should('not.be.visible')
68-
cy.get('body > .viewer a.next').should('not.be.visible')
67+
cy.get('body > .viewer button.prev').should('not.be.visible')
68+
cy.get('body > .viewer button.next').should('not.be.visible')
6969
})
7070

7171
it('Take screenshot', function() {

‎apps/viewer/apps/viewer/cypress/e2e/audio.ogg.cy.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ describe('Open audio.ogg in viewer', function() {
6464
})
6565

6666
it('Does not see navigation arrows', function() {
67-
cy.get('body > .viewer a.prev').should('not.be.visible')
68-
cy.get('body > .viewer a.next').should('not.be.visible')
67+
cy.get('body > .viewer button.prev').should('not.be.visible')
68+
cy.get('body > .viewer button.next').should('not.be.visible')
6969
})
7070

7171
it('Take screenshot', function() {

‎apps/viewer/apps/viewer/cypress/e2e/audios.cy.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ describe('Open mp3 and ogg audio in viewer', function() {
6464
cy.get('body > .viewer .modal-container .viewer__file.viewer__file--active audio')
6565
.should('have.attr', 'src')
6666
.and('contain', `/remote.php/dav/files/${randUser}/audio.mp3`)
67-
cy.get('body > .viewer a.next').should('be.visible')
68-
cy.get('body > .viewer a.next').should('be.visible')
67+
cy.get('body > .viewer button.next').should('be.visible')
68+
cy.get('body > .viewer button.next').should('be.visible')
6969
})
7070

7171
it('Does not see a loading animation', function() {
@@ -80,13 +80,13 @@ describe('Open mp3 and ogg audio in viewer', function() {
8080
})
8181

8282
it('Show audio.ogg on next', function() {
83-
cy.get('body > .viewer a.next').click()
83+
cy.get('body > .viewer button.next').click()
8484
cy.get('body > .viewer .modal-container audio').should('have.length', 2)
8585
cy.get('body > .viewer .modal-container .viewer__file.viewer__file--active audio')
8686
.should('have.attr', 'src')
8787
.and('contain', `/remote.php/dav/files/${randUser}/audio.ogg`)
88-
cy.get('body > .viewer a.prev').should('be.visible')
89-
cy.get('body > .viewer a.next').should('be.visible')
88+
cy.get('body > .viewer button.prev').should('be.visible')
89+
cy.get('body > .viewer button.next').should('be.visible')
9090
})
9191

9292
it('Does not see a loading animation', function() {

‎apps/viewer/apps/viewer/cypress/e2e/download-share-disabled.cy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ describe(`Download ${fileName} in viewer`, function() {
9292

9393
it('See the title on the viewer header but not the Download button', function() {
9494
cy.get('body > .viewer .modal-title').should('contain', 'image1.jpg')
95-
cy.get('body > .viewer .modal-header a.action-item > .download-icon').should('not.exist')
95+
cy.get('body > .viewer .modal-header button.action-item > .download-icon').should('not.exist')
9696
cy.get('body > .viewer .modal-header button.header-close').should('be.visible')
9797
})
9898

‎apps/viewer/apps/viewer/cypress/e2e/download-share.cy.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ describe(`Download ${fileName} from viewer in link share`, function() {
8080

8181
it('See the download icon and title on the viewer header', function() {
8282
cy.get('body > .viewer .modal-title').should('contain', 'image1.jpg')
83-
cy.get('body > .viewer .modal-header a.action-item > .download-icon').should('be.visible')
83+
cy.get('body > .viewer .modal-header button.action-item > .download-icon').should('be.visible')
8484
cy.get('body > .viewer .modal-header button.header-close').should('be.visible')
8585
})
8686

8787
it('Download the image', function() {
8888
// download the file
89-
cy.get('body > .viewer .modal-header a.action-item > .download-icon').click()
89+
cy.get('body > .viewer .modal-header button.action-item > .download-icon').click()
9090
})
9191

9292
it('Compare downloaded file with asset by size', function() {

‎apps/viewer/apps/viewer/cypress/e2e/files-shares.cy.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ describe('See shared folder with link share', function() {
9292
it('Does see next navigation arrows', function() {
9393
cy.get('body > .viewer .modal-container img').should('have.length', 2)
9494
cy.get('body > .viewer .modal-container img').should('have.attr', 'src')
95-
cy.get('body > .viewer a.next').should('be.visible')
96-
cy.get('body > .viewer a.next').should('be.visible')
95+
cy.get('body > .viewer button.next').should('be.visible')
96+
cy.get('body > .viewer button.next').should('be.visible')
9797
})
9898

9999
it('Show image2 on next', function() {
100-
cy.get('body > .viewer a.next').click()
100+
cy.get('body > .viewer button.next').click()
101101
cy.get('body > .viewer .modal-container img').should('have.length', 3)
102-
cy.get('body > .viewer a.prev').should('be.visible')
103-
cy.get('body > .viewer a.next').should('be.visible')
102+
cy.get('body > .viewer button.prev').should('be.visible')
103+
cy.get('body > .viewer button.next').should('be.visible')
104104
})
105105

106106
it('Does not see a loading animation', function() {
@@ -111,10 +111,10 @@ describe('See shared folder with link share', function() {
111111
})
112112

113113
it('Show image3 on next', function() {
114-
cy.get('body > .viewer a.next').click()
114+
cy.get('body > .viewer button.next').click()
115115
cy.get('body > .viewer .modal-container img').should('have.length', 3)
116-
cy.get('body > .viewer a.prev').should('be.visible')
117-
cy.get('body > .viewer a.next').should('be.visible')
116+
cy.get('body > .viewer button.prev').should('be.visible')
117+
cy.get('body > .viewer button.next').should('be.visible')
118118
})
119119

120120
it('Does not see a loading animation', function() {
@@ -125,10 +125,10 @@ describe('See shared folder with link share', function() {
125125
})
126126

127127
it('Show image4 on next', function() {
128-
cy.get('body > .viewer a.next').click()
128+
cy.get('body > .viewer button.next').click()
129129
cy.get('body > .viewer .modal-container img').should('have.length', 2)
130-
cy.get('body > .viewer a.prev').should('be.visible')
131-
cy.get('body > .viewer a.next').should('be.visible')
130+
cy.get('body > .viewer button.prev').should('be.visible')
131+
cy.get('body > .viewer button.next').should('be.visible')
132132
})
133133

134134
it('Does not see a loading animation', function() {
@@ -139,12 +139,12 @@ describe('See shared folder with link share', function() {
139139
})
140140

141141
it('Show video1 on next', function() {
142-
cy.get('body > .viewer a.next').click()
142+
cy.get('body > .viewer button.next').click()
143143
// only 2 because we don't know if we're at the end of the slideshow, current vid and prev img
144144
cy.get('body > .viewer .modal-container img').should('have.length', 1)
145145
cy.get('body > .viewer .modal-container video').should('have.length', 1)
146-
cy.get('body > .viewer a.prev').should('be.visible')
147-
cy.get('body > .viewer a.next').should('be.visible')
146+
cy.get('body > .viewer button.prev').should('be.visible')
147+
cy.get('body > .viewer button.next').should('be.visible')
148148
cy.get('body > .viewer .modal-title').should('contain', 'video1.mp4')
149149
})
150150

@@ -156,10 +156,10 @@ describe('See shared folder with link share', function() {
156156
})
157157

158158
it('Show image1 again on next', function() {
159-
cy.get('body > .viewer a.next').click()
159+
cy.get('body > .viewer button.next').click()
160160
cy.get('body > .viewer .modal-container img').should('have.length', 2)
161-
cy.get('body > .viewer a.prev').should('be.visible')
162-
cy.get('body > .viewer a.next').should('be.visible')
161+
cy.get('body > .viewer button.prev').should('be.visible')
162+
cy.get('body > .viewer button.next').should('be.visible')
163163
})
164164

165165
it('Does not see a loading animation', function() {

‎apps/viewer/apps/viewer/cypress/e2e/image-small.png.cy.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('Open image-small.png in viewer', function() {
6464
})
6565

6666
it('Does not see navigation arrows', function() {
67-
cy.get('body > .viewer a.prev').should('not.be.visible')
68-
cy.get('body > .viewer a.next').should('not.be.visible')
67+
cy.get('body > .viewer button.prev').should('not.be.visible')
68+
cy.get('body > .viewer button.next').should('not.be.visible')
6969
})
7070
})

‎apps/viewer/apps/viewer/cypress/e2e/image.gif.cy.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ describe('Open image.gif in viewer', function() {
6565
})
6666

6767
it('Does not see navigation arrows', function() {
68-
cy.get('body > .viewer a.prev').should('not.be.visible')
69-
cy.get('body > .viewer a.next').should('not.be.visible')
68+
cy.get('body > .viewer button.prev').should('not.be.visible')
69+
cy.get('body > .viewer button.next').should('not.be.visible')
7070
})
7171

7272
it('Take screenshot', function() {

‎apps/viewer/apps/viewer/cypress/e2e/image.png.cy.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('Open image.png in viewer', function() {
6464
})
6565

6666
it('Does not see navigation arrows', function() {
67-
cy.get('body > .viewer a.prev').should('not.be.visible')
68-
cy.get('body > .viewer a.next').should('not.be.visible')
67+
cy.get('body > .viewer button.prev').should('not.be.visible')
68+
cy.get('body > .viewer button.next').should('not.be.visible')
6969
})
7070
})

‎apps/viewer/apps/viewer/cypress/e2e/image.svg.cy.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ describe('Open image.svg in viewer', function() {
6565
})
6666

6767
it('Does not see navigation arrows', function() {
68-
cy.get('body > .viewer a.prev').should('not.be.visible')
69-
cy.get('body > .viewer a.next').should('not.be.visible')
68+
cy.get('body > .viewer button.prev').should('not.be.visible')
69+
cy.get('body > .viewer button.next').should('not.be.visible')
7070
})
7171

7272
it('Have the base64 encoded value of the svg', function() {

0 commit comments

Comments
 (0)