#150: Fix continuous test.

archfz · Jul 8, 2022 · 5e75032 · 5e75032
1 parent a785736
commit 5e75032
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/test/cypress/integration/continuousLogging.spec.js b/test/cypress/integration/continuousLogging.spec.js
@@ -9,6 +9,7 @@ describe('continuous logging', () => {
 
   it('logs many again', () => {
     cy.log('log again 1');
+    cy.wait(100);
     cy.wait(2000);
     cy.log('log again 2');
   });

diff --git a/test/specs/misc.spec.js b/test/specs/misc.spec.js
@@ -98,19 +98,22 @@ describe('Misc.', () => {
 
   it('Should continuously log.', async function () {
     let checksMade = 0;
-    await runTestContinuous(commandBase(['enableContinuousLogging=1'], ['continuousLogging.spec.js']), (data, elapsedTime) => {
-      if (elapsedTime > 5 && elapsedTime <= 6) {
-        ++checksMade;
-        expect(clean(data)).to.contain(`cy:log ${ICONS.info}  log 1`);
-        expect(clean(data)).to.contain(`cy:log ${ICONS.info}  log 2`);
-        expect(clean(data)).to.not.contain(`cy:log ${ICONS.info}  log 3`);
-      }
-      if (elapsedTime > 6 && elapsedTime <= 7) {
-        ++checksMade;
-        expect(clean(data)).to.contain(`cy:log ${ICONS.info}  log again 1`);
-        expect(clean(data)).to.not.contain(`cy:log ${ICONS.info}  log again 2`);
-      }
-    });
+    await runTestContinuous(
+      commandBase(['enableContinuousLogging=1'], ['continuousLogging.spec.js']),
+      'continuous logging',
+      (data, elapsedTime) => {
+        if (elapsedTime > 0.5 && elapsedTime <= 1) {
+          ++checksMade;
+          expect(clean(data)).to.contain(`cy:log ${ICONS.info}  log 1`);
+          expect(clean(data)).to.contain(`cy:log ${ICONS.info}  log 2`);
+          expect(clean(data)).to.not.contain(`cy:log ${ICONS.info}  log 3`);
+        }
+        if (elapsedTime > 2.6 && elapsedTime <= 3) {
+          ++checksMade;
+          expect(clean(data)).to.contain(`cy:log ${ICONS.info}  log again 1`);
+          expect(clean(data)).to.not.contain(`cy:log ${ICONS.info}  log again 2`);
+        }
+      });
 
     expect(checksMade, "No checks where made. The process might have ended too early.").to.be.greaterThan(0)
   }).timeout(60000);

diff --git a/test/utils.js b/test/utils.js
@@ -59,10 +59,10 @@ export const runTest = async (command, callback) => {
   });
 };
 
-export const runTestContinuous = async (command, callback) => {
+export const runTestContinuous = async (command, afterOutput, callback) => {
   await new Promise(resolve => {
     let allData = '';
-    const startTime = (new Date()).getTime();
+    let startTime;
     const mainCommand = command.split(' ')[0];
     const args = command.split(' ').map(arg => arg.replace(/^"/, '').replace(/"$/, ''));
     args.shift();
@@ -72,8 +72,14 @@ export const runTestContinuous = async (command, callback) => {
     child.on('close', resolve);
 
     const dataCallback = (data) => {
-      allData += data.toString();
-      callback(allData, ((new Date()).getTime() - startTime) / 1000);
+      if (data.toString().includes(afterOutput)) {
+        startTime = (new Date()).getTime();
+      }
+
+      if (startTime) {
+        allData += data.toString();
+        callback(allData, ((new Date()).getTime() - startTime) / 1000);
+      }
     };
 
     child.stdout.setEncoding('utf8');