From 5e2e2ba7ad5b86d87fb54efc42f66d0a28c7ffd2 Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Thu, 22 Aug 2024 12:03:32 +0200 Subject: [PATCH] fix(cypress): drop unwanted docker output characters Signed-off-by: skjnldsv --- cypress/dockerNode.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cypress/dockerNode.ts b/cypress/dockerNode.ts index 2c8aa6c5109..a9e8c7c6c45 100644 --- a/cypress/dockerNode.ts +++ b/cypress/dockerNode.ts @@ -136,8 +136,8 @@ export const configureNextcloud = async function() { const hashing = await runExec(container, ['php', 'occ', 'config:system:get', 'hashing_default_password']) console.log('ā”œā”€ Checking APCu configuration... šŸ‘€') - if (!distributed.trim().includes('\\OC\\Memcache\\APCu') - || !local.trim().includes('\\OC\\Memcache\\APCu') + if (!distributed.trim().includes('Memcache\\APCu') + || !local.trim().includes('Memcache\\APCu') || !hashing.trim().includes('true')) { console.log('ā””ā”€ APCu is not properly configured šŸ›‘') throw new Error('APCu is not properly configured') @@ -294,9 +294,14 @@ const runExec = async function( if (stream) { stream.setEncoding('utf-8') stream.on('data', str => { + str = str.trim() + // Remove non printable characters + .replace(/[^\x20-\x7E]+/g, '') + // Remove non alphanumeric leading characters + .replace(/^[^a-z]/gi, '') output += str - if (verbose && str.trim() !== '') { - console.log(`ā”œā”€ ${str.trim().replace(/\n/gi, '\nā”œā”€ ')}`) + if (verbose && str !== '') { + console.log(`ā”œā”€ ${str.replace(/\n/gi, '\nā”œā”€ ')}`) } }) stream.on('end', () => resolve(output))