Merge pull request #168 from nextcloud/fix/cypress-sessions

Author: skjnldsv

cypress/dockerNode.ts

@@ -34,8 +34,18 @@ const SERVER_IMAGE = 'ghcr.io/nextcloud/continuous-integration-shallow-server'
 export const startNextcloud = async function (branch: string = 'master'): Promise<any> {
 	try {
 		// Pulling images
-		console.log('Pulling images...')
-		await docker.pull(SERVER_IMAGE)
+		console.log('Pulling images... ⏳')
+		await new Promise((resolve, reject) => docker.pull(SERVER_IMAGE, (_err, stream: Stream) => {
+			const onFinished = function(err: Error | null) {
+				if (!err) {
+					return resolve(true)
+				}
+				reject(err)
+			}
+			// https://github.com/apocas/dockerode/issues/357
+			docker.modem.followProgress(stream, onFinished)
+		}))
+		console.log('└─ Done')
 
 		// Getting latest image
 		console.log('\nChecking running containers... 🔍')

cypress/e2e/sessions.cy.ts

@@ -22,6 +22,8 @@
 import { User } from '../../dist'
 
 describe('Login and logout', function() {
+	before(() => cy.logout())
+
 	it('Login and see the default files list', function() {
 		cy.visit('/apps/files')
 		cy.url().should('include', '/login')

cypress/e2e/users.cy.ts

@@ -22,6 +22,7 @@
 import { User } from '../../dist'
 import { randHash } from '../utils'
 
+beforeEach(() => cy.logout())
 
 describe('Create user and login', function() {
 	it('Create random user and log in', function() {
@@ -91,9 +92,9 @@ describe('Write and read user metadata', () => {
 
 		cy.modifyUser(user, 'displayname', 'John Doe')
 		cy.getUserData(user).then(response => {
-			const parser = new DOMParser();
-			const xmlDoc = parser.parseFromString(response.body, "text/xml");
+			const parser = new DOMParser()
+			const xmlDoc = parser.parseFromString(response.body, 'text/xml')
 			expect(xmlDoc.querySelector('data displayname')?.textContent).to.eq('John Doe')
 		})
 	})
-})
+})