Skip to content

Commit ae8eab7

Browse files
szaimenszaimen
authored
Merge pull request #1209 from nextcloud/backport/1206/stable22
[stable22] Properly cancel and reset ongoing streams when unmounting
2 parents d89bf2b + f57c9d0 commit ae8eab7

21 files changed

+18521
-18920
lines changed

‎cypress/integration/delete.spec.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,4 @@ describe('Delete image.png in viewer', function() {
7474
cy.get('#fileList tr[data-file="image.png"]', { timeout: 10000 })
7575
.should('not.exist')
7676
})
77-
78-
it('Does not have any visual regression', function() {
79-
// cy.matchImageSnapshot()
80-
})
8177
})

‎cypress/integration/download-share-disabled.spec.js‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ describe(`Download ${fileName} in viewer`, function() {
5252
cy.get('#fileList tr').should('contain', 'Photos')
5353
})
5454

55-
it('Does not have any visual regression 1', function() {
56-
// cy.matchImageSnapshot()
57-
})
58-
5955
it('See shared files in the list', function() {
6056
cy.openFile('Photos')
6157
cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 })
@@ -64,10 +60,6 @@ describe(`Download ${fileName} in viewer`, function() {
6460
.should('contain', 'image2.jpg')
6561
})
6662

67-
it('Does not have any visual regression 2', function() {
68-
// cy.matchImageSnapshot()
69-
})
70-
7163
it('Share the Photos folder with a share link and access the share link', function() {
7264
cy.createLinkShare('/Photos').then(token => {
7365
// Open the sidebar
@@ -86,10 +78,6 @@ describe(`Download ${fileName} in viewer`, function() {
8678
})
8779
})
8880

89-
it('Does not have any visual regression 3', function() {
90-
// cy.matchImageSnapshot()
91-
})
92-
9381
it('Open the viewer on file click', function() {
9482
cy.openFile('image1.jpg')
9583
cy.get('body > .viewer').should('be.visible')

‎cypress/integration/download-share.spec.js‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ describe(`Download ${fileName} from viewer in link share`, function() {
5151
cy.get('#fileList tr').should('contain', 'Photos')
5252
})
5353

54-
it('Does not have any visual regression 1', function() {
55-
// cy.matchImageSnapshot()
56-
})
57-
5854
it('See shared files in the list', function() {
5955
cy.openFile('Photos')
6056
cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 })
@@ -63,21 +59,13 @@ describe(`Download ${fileName} from viewer in link share`, function() {
6359
.should('contain', 'image2.jpg')
6460
})
6561

66-
it('Does not have any visual regression 2', function() {
67-
// cy.matchImageSnapshot()
68-
})
69-
7062
it('Share the Photos folder with a share link and access the share link', function() {
7163
cy.createLinkShare('/Photos').then(token => {
7264
cy.logout()
7365
cy.visit(`/s/${token}`)
7466
})
7567
})
7668

77-
it('Does not have any visual regression 3', function() {
78-
// cy.matchImageSnapshot()
79-
})
80-
8169
it('Open the viewer on file click', function() {
8270
cy.openFile('image1.jpg')
8371
cy.get('body > .viewer').should('be.visible')

‎cypress/integration/files-shares.spec.js‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ describe('See shared folder with link share', function() {
5151
cy.get('#fileList tr').should('contain', 'Photos')
5252
})
5353

54-
it('Does not have any visual regression 1', function() {
55-
// cy.matchImageSnapshot()
56-
})
57-
5854
it('See shared files in the list', function() {
5955
cy.openFile('Photos')
6056
cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 })
@@ -69,21 +65,13 @@ describe('See shared folder with link share', function() {
6965
.should('contain', 'video1.mp4')
7066
})
7167

72-
it('Does not have any visual regression 2', function() {
73-
// cy.matchImageSnapshot()
74-
})
75-
7668
it('Share the Photos folder with a share link and access the share link', function() {
7769
cy.createLinkShare('/Photos').then(token => {
7870
cy.logout()
7971
cy.visit(`/s/${token}`)
8072
})
8173
})
8274

83-
it('Does not have any visual regression 3', function() {
84-
// cy.matchImageSnapshot()
85-
})
86-
8775
it('Open the viewer on file click', function() {
8876
cy.openFile('image1.jpg')
8977
cy.get('body > .viewer').should('be.visible')
@@ -108,10 +96,6 @@ describe('See shared folder with link share', function() {
10896
cy.get('body > .viewer a.next').should('be.visible')
10997
})
11098

111-
it('Does not have any visual regression 4', function() {
112-
// cy.matchImageSnapshot()
113-
})
114-
11599
it('Show image2 on next', function() {
116100
cy.get('body > .viewer a.next').click()
117101
cy.get('body > .viewer .modal-container img').should('have.length', 3)
@@ -126,10 +110,6 @@ describe('See shared folder with link share', function() {
126110
.and('not.have.class', 'icon-loading')
127111
})
128112

129-
it('Does not have any visual regression 5', function() {
130-
// cy.matchImageSnapshot()
131-
})
132-
133113
it('Show image3 on next', function() {
134114
cy.get('body > .viewer a.next').click()
135115
cy.get('body > .viewer .modal-container img').should('have.length', 3)
@@ -144,10 +124,6 @@ describe('See shared folder with link share', function() {
144124
.and('not.have.class', 'icon-loading')
145125
})
146126

147-
it('Does not have any visual regression 6', function() {
148-
// cy.matchImageSnapshot()
149-
})
150-
151127
it('Show image4 on next', function() {
152128
cy.get('body > .viewer a.next').click()
153129
cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -162,10 +138,6 @@ describe('See shared folder with link share', function() {
162138
.and('not.have.class', 'icon-loading')
163139
})
164140

165-
it('Does not have any visual regression 7', function() {
166-
// cy.matchImageSnapshot()
167-
})
168-
169141
it('Show video1 on next', function() {
170142
cy.get('body > .viewer a.next').click()
171143
// only 2 because we don't know if we're at the end of the slideshow, current vid and prev img
@@ -183,10 +155,6 @@ describe('See shared folder with link share', function() {
183155
.and('not.have.class', 'icon-loading')
184156
})
185157

186-
it('Does not have any visual regression 8', function() {
187-
// cy.matchImageSnapshot()
188-
})
189-
190158
it('Show image1 again on next', function() {
191159
cy.get('body > .viewer a.next').click()
192160
cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -200,8 +168,4 @@ describe('See shared folder with link share', function() {
200168
.and('have.class', 'modal-mask')
201169
.and('not.have.class', 'icon-loading')
202170
})
203-
204-
it('Does not have any visual regression 9', function() {
205-
// cy.matchImageSnapshot()
206-
})
207171
})

‎cypress/integration/image-small.png.spec.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,4 @@ describe('Open image-small.png in viewer', function() {
6767
cy.get('body > .viewer a.prev').should('not.be.visible')
6868
cy.get('body > .viewer a.next').should('not.be.visible')
6969
})
70-
71-
it('Does not have any visual regression', function() {
72-
// cy.matchImageSnapshot()
73-
})
7470
})

‎cypress/integration/image.png.spec.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,4 @@ describe('Open image.png in viewer', function() {
7171
cy.get('body > .viewer a.prev').should('not.be.visible')
7272
cy.get('body > .viewer a.next').should('not.be.visible')
7373
})
74-
75-
it('Does not have any visual regression', function() {
76-
// cy.matchImageSnapshot()
77-
})
7874
})

‎cypress/integration/image.svg.spec.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,4 @@ describe('Open image.svg in viewer', function() {
7474
.should('have.attr', 'src')
7575
.should('contain', 'data:image/svg+xml;base64')
7676
})
77-
78-
it('Does not have any visual regression', function() {
79-
// cy.matchImageSnapshot()
80-
})
8177
})

‎cypress/integration/image.webp.spec.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,4 @@ describe('Open image.webp in viewer', function() {
7171
cy.get('body > .viewer a.prev').should('not.be.visible')
7272
cy.get('body > .viewer a.next').should('not.be.visible')
7373
})
74-
75-
it('Does not have any visual regression', function() {
76-
cy.matchImageSnapshot()
77-
})
7874
})

‎cypress/integration/images-custom-list-loadmore.spec.js‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,6 @@ describe('Open custom list of images in viewer with pagination', function() {
146146
cy.get('body > .viewer a.next').should('be.visible')
147147
})
148148

149-
it('Does not have any visual regression 1', function() {
150-
// cy.matchImageSnapshot()
151-
})
152-
153149
it('Show image2 on next', function() {
154150
cy.get('body > .viewer a.next').click()
155151
cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -164,10 +160,6 @@ describe('Open custom list of images in viewer with pagination', function() {
164160
.and('not.have.class', 'icon-loading')
165161
})
166162

167-
it('Does not have any visual regression 2', function() {
168-
// cy.matchImageSnapshot()
169-
})
170-
171163
it('Show image3 on next', function() {
172164
cy.get('body > .viewer a.next').click()
173165
cy.get('body > .viewer .modal-container img').should('have.length', 3)
@@ -182,10 +174,6 @@ describe('Open custom list of images in viewer with pagination', function() {
182174
.and('not.have.class', 'icon-loading')
183175
})
184176

185-
it('Does not have any visual regression 3', function() {
186-
// cy.matchImageSnapshot()
187-
})
188-
189177
it('Show image4 on next', function() {
190178
cy.get('body > .viewer a.next').click()
191179
cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -200,10 +188,6 @@ describe('Open custom list of images in viewer with pagination', function() {
200188
.and('not.have.class', 'icon-loading')
201189
})
202190

203-
it('Does not have any visual regression 4', function() {
204-
// cy.matchImageSnapshot()
205-
})
206-
207191
it('Show image1 again on next', function() {
208192
cy.get('body > .viewer a.next').click()
209193
cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -217,8 +201,4 @@ describe('Open custom list of images in viewer with pagination', function() {
217201
.and('have.class', 'modal-mask')
218202
.and('not.have.class', 'icon-loading')
219203
})
220-
221-
it('Does not have any visual regression 5', function() {
222-
// cy.matchImageSnapshot()
223-
})
224204
})

‎cypress/integration/images-custom-list.spec.js‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ describe('Open custom images list in viewer', function() {
111111
cy.get('body > .viewer a.next').should('be.visible')
112112
})
113113

114-
it('Does not have any visual regression 1', function() {
115-
// cy.matchImageSnapshot()
116-
})
117-
118114
it('Show image3 on next', function() {
119115
cy.get('body > .viewer a.next').click()
120116
cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -135,10 +131,6 @@ describe('Open custom images list in viewer', function() {
135131
cy.get('body > .viewer .modal-header button.icon-close').should('be.visible')
136132
})
137133

138-
it('Does not have any visual regression 2', function() {
139-
// cy.matchImageSnapshot()
140-
})
141-
142134
it('Show image1 on next', function() {
143135
cy.get('body > .viewer a.next').click()
144136
cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -158,8 +150,4 @@ describe('Open custom images list in viewer', function() {
158150
cy.get('body > .viewer .modal-header button.action-item__menutoggle').should('be.visible')
159151
cy.get('body > .viewer .modal-header button.icon-close').should('be.visible')
160152
})
161-
162-
it('Does not have any visual regression 3', function() {
163-
// cy.matchImageSnapshot()
164-
})
165153
})

0 commit comments

Comments
 (0)