Update cypress test suite

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

Author: skjnldsv

cypress.config.ts

@@ -13,7 +13,11 @@ export default defineConfig({
 	viewportHeight: 720,
 
 	// Tries again 2 more times on failure
-	retries: 2,
+	retries: {
+		runMode: 2,
+		// do not retry in `cypress open`
+		openMode: 0,
+	},
 
 	// Needed to trigger `after:run` events with cypress open
 	experimentalInteractiveRunEvents: true,

cypress/e2e/delete.cy.js renamed to cypress/e2e/actions/delete.cy.js

@@ -20,27 +20,25 @@
  *
  */
 
-import { randHash } from '../utils'
+import { randHash } from '../../utils'
 const randUser = randHash()
 
 describe('Delete image.png in viewer', function() {
 	before(function() {
 		// Init user
-		cy.nextcloudCreateUser(randUser, 'password')
-		cy.login(randUser, 'password')
+		cy.nextcloudCreateUser(randUser)
 
 		// Upload test files
-		cy.uploadFile('image.png', 'image/png')
-		cy.visit('/apps/files')
-
-		// wait a bit for things to be settled
-		cy.wait(1000)
+		cy.uploadFile(randUser, 'image.png', 'image/png')
 	})
 	after(function() {
 		cy.logout()
 	})
 
 	it('See image.png in the list', function() {
+		cy.login(randUser)
+		cy.visit('/apps/files')
+
 		cy.get('.files-fileList tr[data-file="image.png"]', { timeout: 10000 })
 			.should('contain', 'image.png')
 	})

cypress/e2e/download.cy.js renamed to cypress/e2e/actions/download.cy.js

@@ -20,7 +20,7 @@
  *
  */
 
-import { randHash } from '../utils'
+import { randHash } from '../../utils'
 import * as path from 'path'
 
 const randUser = randHash()
@@ -29,22 +29,20 @@ const fileName = 'image.png'
 describe(`Download ${fileName} in viewer`, function() {
 	before(function() {
 		// Init user
-		cy.nextcloudCreateUser(randUser, 'password')
-		cy.login(randUser, 'password')
+		cy.nextcloudCreateUser(randUser)
 
 		// Upload test files
-		cy.uploadFile(fileName, 'image/png')
-		cy.visit('/apps/files')
-
-		// wait a bit for things to be settled
-		cy.wait(1000)
+		cy.uploadFile(randUser, fileName, 'image/png')
 	})
 
 	after(function() {
 		cy.logout()
 	})
 
 	it(`See "${fileName}" in the list`, function() {
+		cy.login(randUser)
+		cy.visit('/apps/files')
+
 		cy.get(`.files-fileList tr[data-file="${fileName}"]`, { timeout: 10000 })
 			.should('contain', fileName)
 	})

cypress/e2e/sidebar.cy.js renamed to cypress/e2e/actions/sidebar.cy.js

@@ -21,30 +21,28 @@
  *
  */
 
-import { randHash } from '../utils/'
+import { randHash } from '../../utils'
 const randUser = randHash()
 
 describe('Open the sidebar from the viewer and open viewer with sidebar already opened', function() {
 	before(function() {
 		// Init user
-		cy.nextcloudCreateUser(randUser, 'password')
-		cy.login(randUser, 'password')
+		cy.nextcloudCreateUser(randUser)
 
 		// Upload test files
-		cy.uploadFile('image1.jpg', 'image/jpeg')
-		cy.uploadFile('image2.jpg', 'image/jpeg')
-		cy.uploadFile('image3.jpg', 'image/jpeg')
-		cy.uploadFile('image4.jpg', 'image/jpeg')
-		cy.visit('/apps/files')
-
-		// wait a bit for things to be settled
-		cy.wait(1000)
+		cy.uploadFile(randUser, 'image1.jpg', 'image/jpeg')
+		cy.uploadFile(randUser, 'image2.jpg', 'image/jpeg')
+		cy.uploadFile(randUser, 'image3.jpg', 'image/jpeg')
+		cy.uploadFile(randUser, 'image4.jpg', 'image/jpeg')
 	})
 	after(function() {
 		cy.logout()
 	})
 
 	it('See images in the list', function() {
+		cy.login(randUser)
+		cy.visit('/apps/files')
+
 		cy.get('.files-fileList tr[data-file="image1.jpg"]', { timeout: 10000 })
 			.should('contain', 'image1.jpg')
 		cy.get('.files-fileList tr[data-file="image2.jpg"]', { timeout: 10000 })

cypress/e2e/audio.mpeg.cy.js renamed to cypress/e2e/audios/audio.mpeg.cy.js

@@ -20,27 +20,25 @@
  *
  */
 
-import { randHash } from '../utils/'
+import { randHash } from '../../utils'
 const randUser = randHash()
 
 describe('Open audio.mp3 in viewer', function() {
 	before(function() {
 		// Init user
-		cy.nextcloudCreateUser(randUser, 'password')
-		cy.login(randUser, 'password')
+		cy.nextcloudCreateUser(randUser)
 
 		// Upload test files
-		cy.uploadFile('audio.mp3', 'audio/mpeg')
-		cy.visit('/apps/files')
-
-		// wait a bit for things to be settled
-		cy.wait(1000)
+		cy.uploadFile(randUser, 'audio.mp3', 'audio/mpeg')
 	})
 	after(function() {
 		cy.logout()
 	})
 
 	it('See audio.mp3 in the list', function() {
+		cy.login(randUser)
+		cy.visit('/apps/files')
+
 		cy.get('.files-fileList tr[data-file="audio.mp3"]', { timeout: 10000 })
 			.should('contain', 'audio.mp3')
 	})
@@ -68,9 +66,9 @@ describe('Open audio.mp3 in viewer', function() {
 		cy.get('body > .viewer button.next').should('not.be.visible')
 	})
 
-	it('Take screenshot', function() {
-		// video are impossible to match with existing screenshot
-		// just taking a screenshot to manually compare if needed
-		cy.screenshot()
+	it('The audio source is the remote url', function() {
+		cy.get('body > .viewer .modal-container .viewer__file.viewer__file--active audio')
+			.should('have.attr', 'src')
+			.and('contain', `/remote.php/dav/files/${randUser}/audio.mp3`)
 	})
 })

cypress/e2e/audio.ogg.cy.js renamed to cypress/e2e/audios/audio.ogg.cy.js

@@ -20,27 +20,25 @@
  *
  */
 
-import { randHash } from '../utils/'
+import { randHash } from '../../utils'
 const randUser = randHash()
 
 describe('Open audio.ogg in viewer', function() {
 	before(function() {
 		// Init user
-		cy.nextcloudCreateUser(randUser, 'password')
-		cy.login(randUser, 'password')
+		cy.nextcloudCreateUser(randUser)
 
 		// Upload test files
-		cy.uploadFile('audio.ogg', 'audio/mpeg')
-		cy.visit('/apps/files')
-
-		// wait a bit for things to be settled
-		cy.wait(1000)
+		cy.uploadFile(randUser, 'audio.ogg', 'audio/mpeg')
 	})
 	after(function() {
 		cy.logout()
 	})
 
 	it('See audio.ogg in the list', function() {
+		cy.login(randUser)
+		cy.visit('/apps/files')
+
 		cy.get('.files-fileList tr[data-file="audio.ogg"]', { timeout: 10000 })
 			.should('contain', 'audio.ogg')
 	})
@@ -68,9 +66,9 @@ describe('Open audio.ogg in viewer', function() {
 		cy.get('body > .viewer button.next').should('not.be.visible')
 	})
 
-	it('Take screenshot', function() {
-		// video are impossible to match with existing screenshot
-		// just taking a screenshot to manually compare if needed
-		cy.screenshot()
+	it('The audio source is the remote url', function() {
+		cy.get('body > .viewer .modal-container .viewer__file.viewer__file--active audio')
+			.should('have.attr', 'src')
+			.and('contain', `/remote.php/dav/files/${randUser}/audio.ogg`)
 	})
 })

cypress/e2e/audios.cy.js renamed to cypress/e2e/audios/audios.cy.js

@@ -20,28 +20,26 @@
  *
  */
 
-import { randHash } from '../utils/'
+import { randHash } from '../../utils'
 const randUser = randHash()
 
 describe('Open mp3 and ogg audio in viewer', function() {
 	before(function() {
 		// Init user
-		cy.nextcloudCreateUser(randUser, 'password')
-		cy.login(randUser, 'password')
+		cy.nextcloudCreateUser(randUser)
 
 		// Upload test file
-		cy.uploadFile('audio.mp3', 'audio/mpeg')
-		cy.uploadFile('audio.ogg', 'audio/ogg')
-		cy.visit('/apps/files')
-
-		// wait a bit for things to be settled
-		cy.wait(1000)
+		cy.uploadFile(randUser, 'audio.mp3', 'audio/mpeg')
+		cy.uploadFile(randUser, 'audio.ogg', 'audio/ogg')
 	})
 	after(function() {
 		cy.logout()
 	})
 
 	it('See audios in the list', function() {
+		cy.login(randUser)
+		cy.visit('/apps/files')
+
 		cy.get('.files-fileList tr[data-file="audio.mp3"]', { timeout: 10000 })
 			.should('contain', 'audio.mp3')
 		cy.get('.files-fileList tr[data-file="audio.ogg"]', { timeout: 10000 })
@@ -61,11 +59,14 @@ describe('Open mp3 and ogg audio in viewer', function() {
 
 	it('Does see next navigation arrows', function() {
 		cy.get('body > .viewer .modal-container audio').should('have.length', 2)
+		cy.get('body > .viewer button.prev').should('be.visible')
+		cy.get('body > .viewer button.next').should('be.visible')
+	})
+
+	it('The audio source is the remote url', function() {
 		cy.get('body > .viewer .modal-container .viewer__file.viewer__file--active audio')
 			.should('have.attr', 'src')
 			.and('contain', `/remote.php/dav/files/${randUser}/audio.mp3`)
-		cy.get('body > .viewer button.next').should('be.visible')
-		cy.get('body > .viewer button.next').should('be.visible')
 	})
 
 	it('Does not see a loading animation', function() {
@@ -75,18 +76,17 @@ describe('Open mp3 and ogg audio in viewer', function() {
 			.and('not.have.class', 'icon-loading')
 	})
 
-	it('Take screenshot 1', function() {
-		cy.screenshot()
-	})
-
 	it('Show audio.ogg on next', function() {
 		cy.get('body > .viewer button.next').click()
 		cy.get('body > .viewer .modal-container audio').should('have.length', 2)
+		cy.get('body > .viewer button.prev').should('be.visible')
+		cy.get('body > .viewer button.next').should('be.visible')
+	})
+
+	it('The audio source is the remote url', function() {
 		cy.get('body > .viewer .modal-container .viewer__file.viewer__file--active audio')
 			.should('have.attr', 'src')
 			.and('contain', `/remote.php/dav/files/${randUser}/audio.ogg`)
-		cy.get('body > .viewer button.prev').should('be.visible')
-		cy.get('body > .viewer button.next').should('be.visible')
 	})
 
 	it('Does not see a loading animation', function() {
@@ -95,8 +95,4 @@ describe('Open mp3 and ogg audio in viewer', function() {
 			.and('have.class', 'modal-mask')
 			.and('not.have.class', 'icon-loading')
 	})
-
-	it('Take screenshot 2', function() {
-		cy.screenshot()
-	})
 })

cypress/e2e/files.cy.js

@@ -29,6 +29,9 @@ describe('Files default view', function() {
 	})
 
 	it('See the default files list', function() {
+		cy.login('admin', 'admin')
+		cy.visit('/apps/files')
+
 		cy.get('.files-fileList tr').should('contain', 'welcome.txt')
 	})
 

cypress/e2e/image-apng.cy.js renamed to cypress/e2e/images/image-apng.cy.js

@@ -20,27 +20,25 @@
  *
  */
 
-import { randHash } from '../utils/'
+import { randHash } from '../../utils'
 const randUser = randHash()
 
 describe('Open image-apng.png in viewer', function() {
 	before(function() {
 		// Init user
-		cy.nextcloudCreateUser(randUser, 'password')
-		cy.login(randUser, 'password')
+		cy.nextcloudCreateUser(randUser)
 
 		// Upload test files
-		cy.uploadFile('image-apng.png', 'image/png')
-		cy.visit('/apps/files')
-
-		// wait a bit for things to be settled
-		cy.wait(1000)
+		cy.uploadFile(randUser, 'image-apng.png', 'image/png')
 	})
 	after(function() {
 		cy.logout()
 	})
 
 	it('See image-apng.png in the list', function() {
+		cy.login(randUser)
+		cy.visit('/apps/files')
+
 		cy.get('.files-fileList tr[data-file="image-apng.png"]', { timeout: 10000 })
 			.should('contain', 'image-apng.png')
 	})
@@ -67,4 +65,10 @@ describe('Open image-apng.png in viewer', function() {
 		cy.get('body > .viewer button.prev').should('not.be.visible')
 		cy.get('body > .viewer button.next').should('not.be.visible')
 	})
+
+	it('The image source is the preview url', function() {
+		cy.get('body > .viewer .modal-container img.viewer__file.viewer__file--active')
+			.should('have.attr', 'src')
+			.and('contain', '/index.php/core/preview')
+	})
 })