Merge pull request #1211 from nextcloud/fix/remove-cypress-image-snap…

…shot
nextcloud · Apr 13, 2022 · 4982683 · 4982683
2 parents 92ae401 + a14fac1
commit 4982683
Show file tree

Hide file tree

Showing 17 changed files with 2,289 additions and 9,946 deletions.
diff --git a/cypress/integration/delete.spec.js b/cypress/integration/delete.spec.js
@@ -74,8 +74,4 @@ describe('Delete image.png in viewer', function() {
 		cy.get('#fileList tr[data-file="image.png"]', { timeout: 10000 })
 			.should('not.exist')
 	})
-
-	it('Does not have any visual regression', function() {
-		// cy.matchImageSnapshot()
-	})
 })
diff --git a/cypress/integration/download-share-disabled.spec.js b/cypress/integration/download-share-disabled.spec.js
@@ -52,10 +52,6 @@ describe(`Download ${fileName} in viewer`, function() {
 		cy.get('#fileList tr').should('contain', 'Photos')
 	})
 
-	it('Does not have any visual regression 1', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('See shared files in the list', function() {
 		cy.openFile('Photos')
 		cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 })
@@ -64,10 +60,6 @@ describe(`Download ${fileName} in viewer`, function() {
 			.should('contain', 'image2.jpg')
 	})
 
-	it('Does not have any visual regression 2', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Share the Photos folder with a share link and access the share link', function() {
 		cy.createLinkShare('/Photos').then(token => {
 			// Open the sidebar
@@ -86,10 +78,6 @@ describe(`Download ${fileName} in viewer`, function() {
 		})
 	})
 
-	it('Does not have any visual regression 3', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Open the viewer on file click', function() {
 		cy.openFile('image1.jpg')
 		cy.get('body > .viewer').should('be.visible')

diff --git a/cypress/integration/download-share.spec.js b/cypress/integration/download-share.spec.js
@@ -51,10 +51,6 @@ describe(`Download ${fileName} from viewer in link share`, function() {
 		cy.get('#fileList tr').should('contain', 'Photos')
 	})
 
-	it('Does not have any visual regression 1', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('See shared files in the list', function() {
 		cy.openFile('Photos')
 		cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 })
@@ -63,21 +59,13 @@ describe(`Download ${fileName} from viewer in link share`, function() {
 			.should('contain', 'image2.jpg')
 	})
 
-	it('Does not have any visual regression 2', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Share the Photos folder with a share link and access the share link', function() {
 		cy.createLinkShare('/Photos').then(token => {
 			cy.logout()
 			cy.visit(`/s/${token}`)
 		})
 	})
 
-	it('Does not have any visual regression 3', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Open the viewer on file click', function() {
 		cy.openFile('image1.jpg')
 		cy.get('body > .viewer').should('be.visible')

diff --git a/cypress/integration/files-shares.spec.js b/cypress/integration/files-shares.spec.js
@@ -51,10 +51,6 @@ describe('See shared folder with link share', function() {
 		cy.get('#fileList tr').should('contain', 'Photos')
 	})
 
-	it('Does not have any visual regression 1', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('See shared files in the list', function() {
 		cy.openFile('Photos')
 		cy.get('#fileList tr[data-file="image1.jpg"]', { timeout: 10000 })
@@ -69,21 +65,13 @@ describe('See shared folder with link share', function() {
 			.should('contain', 'video1.mp4')
 	})
 
-	it('Does not have any visual regression 2', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Share the Photos folder with a share link and access the share link', function() {
 		cy.createLinkShare('/Photos').then(token => {
 			cy.logout()
 			cy.visit(`/s/${token}`)
 		})
 	})
 
-	it('Does not have any visual regression 3', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Open the viewer on file click', function() {
 		cy.openFile('image1.jpg')
 		cy.get('body > .viewer').should('be.visible')
@@ -108,10 +96,6 @@ describe('See shared folder with link share', function() {
 		cy.get('body > .viewer a.next').should('be.visible')
 	})
 
-	it('Does not have any visual regression 4', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image2 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		cy.get('body > .viewer .modal-container img').should('have.length', 3)
@@ -126,10 +110,6 @@ describe('See shared folder with link share', function() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 5', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image3 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		cy.get('body > .viewer .modal-container img').should('have.length', 3)
@@ -144,10 +124,6 @@ describe('See shared folder with link share', function() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 6', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image4 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -162,10 +138,6 @@ describe('See shared folder with link share', function() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 7', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show video1 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		// 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() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 8', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image1 again on next', function() {
 		cy.get('body > .viewer a.next').click()
 		cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -200,8 +168,4 @@ describe('See shared folder with link share', function() {
 			.and('have.class', 'modal-mask')
 			.and('not.have.class', 'icon-loading')
 	})
-
-	it('Does not have any visual regression 9', function() {
-		// cy.matchImageSnapshot()
-	})
 })
diff --git a/cypress/integration/image-small.png.spec.js b/cypress/integration/image-small.png.spec.js
@@ -67,8 +67,4 @@ describe('Open image-small.png in viewer', function() {
 		cy.get('body > .viewer a.prev').should('not.be.visible')
 		cy.get('body > .viewer a.next').should('not.be.visible')
 	})
-
-	it('Does not have any visual regression', function() {
-		// cy.matchImageSnapshot()
-	})
 })
diff --git a/cypress/integration/image.png.spec.js b/cypress/integration/image.png.spec.js
@@ -71,8 +71,4 @@ describe('Open image.png in viewer', function() {
 		cy.get('body > .viewer a.prev').should('not.be.visible')
 		cy.get('body > .viewer a.next').should('not.be.visible')
 	})
-
-	it('Does not have any visual regression', function() {
-		// cy.matchImageSnapshot()
-	})
 })
diff --git a/cypress/integration/image.svg.spec.js b/cypress/integration/image.svg.spec.js
@@ -74,8 +74,4 @@ describe('Open image.svg in viewer', function() {
 			.should('have.attr', 'src')
 			.should('contain', 'data:image/svg+xml;base64')
 	})
-
-	it('Does not have any visual regression', function() {
-		// cy.matchImageSnapshot()
-	})
 })
diff --git a/cypress/integration/image.webp.spec.js b/cypress/integration/image.webp.spec.js
@@ -71,8 +71,4 @@ describe('Open image.webp in viewer', function() {
 		cy.get('body > .viewer a.prev').should('not.be.visible')
 		cy.get('body > .viewer a.next').should('not.be.visible')
 	})
-
-	it('Does not have any visual regression', function() {
-		cy.matchImageSnapshot()
-	})
 })
diff --git a/cypress/integration/images-custom-list-loadmore.spec.js b/cypress/integration/images-custom-list-loadmore.spec.js
@@ -146,10 +146,6 @@ describe('Open custom list of images in viewer with pagination', function() {
 		cy.get('body > .viewer a.next').should('be.visible')
 	})
 
-	it('Does not have any visual regression 1', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image2 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		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() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 2', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image3 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		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() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 3', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image4 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		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() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 4', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image1 again on next', function() {
 		cy.get('body > .viewer a.next').click()
 		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() {
 			.and('have.class', 'modal-mask')
 			.and('not.have.class', 'icon-loading')
 	})
-
-	it('Does not have any visual regression 5', function() {
-		// cy.matchImageSnapshot()
-	})
 })
diff --git a/cypress/integration/images-custom-list.spec.js b/cypress/integration/images-custom-list.spec.js
@@ -111,10 +111,6 @@ describe('Open custom images list in viewer', function() {
 		cy.get('body > .viewer a.next').should('be.visible')
 	})
 
-	it('Does not have any visual regression 1', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image3 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -135,10 +131,6 @@ describe('Open custom images list in viewer', function() {
 		cy.get('body > .viewer .modal-header button.header-close').should('be.visible')
 	})
 
-	it('Does not have any visual regression 2', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image1 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -158,8 +150,4 @@ describe('Open custom images list in viewer', function() {
 		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')
 	})
-
-	it('Does not have any visual regression 3', function() {
-		// cy.matchImageSnapshot()
-	})
 })
diff --git a/cypress/integration/images.spec.js b/cypress/integration/images.spec.js
@@ -80,10 +80,6 @@ describe('Open images in viewer', function() {
 		cy.get('body > .viewer a.next').should('be.visible')
 	})
 
-	it('Does not have any visual regression 1', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image2 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		cy.get('body > .viewer .modal-container img').should('have.length', 3)
@@ -98,10 +94,6 @@ describe('Open images in viewer', function() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 2', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image3 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		cy.get('body > .viewer .modal-container img').should('have.length', 3)
@@ -116,10 +108,6 @@ describe('Open images in viewer', function() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 3', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image4 on next', function() {
 		cy.get('body > .viewer a.next').click()
 		// only 2 because we don't know if we're at the end of the slideshow, current img and previous one
@@ -135,10 +123,6 @@ describe('Open images in viewer', function() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Does not have any visual regression 4', function() {
-		// cy.matchImageSnapshot()
-	})
-
 	it('Show image1 again on next', function() {
 		cy.get('body > .viewer a.next').click()
 		cy.get('body > .viewer .modal-container img').should('have.length', 2)
@@ -152,8 +136,4 @@ describe('Open images in viewer', function() {
 			.and('have.class', 'modal-mask')
 			.and('not.have.class', 'icon-loading')
 	})
-
-	it('Does not have any visual regression 5', function() {
-		// cy.matchImageSnapshot()
-	})
 })
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
@@ -12,11 +12,8 @@
 // the project's config changing)
 
 const browserify = require('@cypress/browserify-preprocessor')
-const { addMatchImageSnapshotPlugin } = require('cypress-image-snapshot/plugin')
 
 module.exports = (on, config) => {
 	// Fix browserslist extend https://github.com/cypress-io/cypress/issues/2983#issuecomment-570616682
 	on('file:preprocessor', browserify())
-
-	addMatchImageSnapshotPlugin(on, config)
 }
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -20,11 +20,8 @@
  *
  */
 
-import { addMatchImageSnapshotCommand } from 'cypress-image-snapshot/command'
 import axios from '@nextcloud/axios'
 
-addMatchImageSnapshotCommand()
-
 const url = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')
 Cypress.env('baseUrl', url)
 
@@ -159,14 +156,3 @@ Cypress.Commands.add('createLinkShare', path => {
 		}
 	}).should('have.length', 15)
 })
-
-Cypress.Commands.overwrite('matchImageSnapshot', (originalFn, subject, name, options) => {
-	// hide avatar because random colour break the visual regression tests
-	cy.window().then(window => {
-		const avatarDiv = window.document.querySelector('.avatardiv')
-		if (avatarDiv) {
-			avatarDiv.remove()
-		}
-	})
-	return originalFn(subject, name, options)
-})
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map