Fixing some test logic

Author: perki

components/pryv-monitor/test/load-helpers.js

@@ -4,8 +4,9 @@
  */
 /* global expect, pryv, testData */
 
+const { createId: cuid } = require('@paralleldrive/cuid2');
 require('../src')(pryv);
-const testStreamId = global.testStreamId = 'monitor-test';
+const testStreamId = global.testStreamId = 'mon-' + cuid().slice(0, 8);
 
 global.prepareAndCreateBaseStreams = async () => {
   await testData.prepare();

components/pryv-monitor/test/monitor.test.js

@@ -40,19 +40,15 @@ describe('[MONX] Monitor', function () {
   describe('[MNTX] notifications', () => {
     let monitor = null;
     beforeEach(async () => {
-      monitor = new pryv.Monitor(conn, { limit: 1 });
+      monitor = new pryv.Monitor(conn, { limit: 1, streams: [global.testStreamId] });
     });
 
     afterEach(async () => {
       monitor.stop();
     });
 
     it('[MNTA] Load events at start', async function () {
-      let count = 0;
-      monitor.on('event', function (event) {
-        count++;
-      });
-      await monitor.start();
+      // Create event before starting the monitor so it's picked up on initial load
       await conn.api([
         {
           method: 'events.create',
@@ -63,7 +59,12 @@ describe('[MONX] Monitor', function () {
           }
         }
       ]);
-      await new Promise(resolve => setTimeout(resolve, 8000));
+      let count = 0;
+      monitor.on('event', function (event) {
+        count++;
+      });
+      await monitor.start();
+      await new Promise(resolve => setTimeout(resolve, 2000));
       expect(count).to.be.gt(0);
     });
 

components/pryv-monitor/test/socket.test.js

@@ -17,7 +17,7 @@ describe('[MSKX] Monitor + Socket.IO', function () {
   describe('[MSUX] socket updates', function () {
     this.timeout(25000);
     it('[MSUA] Detect new events added', async function () {
-      const monitor = new pryv.Monitor(apiEndpoint, { limit: 1 })
+      const monitor = new pryv.Monitor(apiEndpoint, { limit: 1, streams: [global.testStreamId] })
         .addUpdateMethod(new pryv.Monitor.UpdateMethod.Socket());
       await monitor.start();
 
@@ -50,7 +50,7 @@ describe('[MSKX] Monitor + Socket.IO', function () {
   describe('[MSTX] stop', () => {
     it('[MSTA] Monitor stops when requested', async function () {
       this.timeout(20000);
-      const monitor = new pryv.Monitor(apiEndpoint, { limit: 1 })
+      const monitor = new pryv.Monitor(apiEndpoint, { limit: 1, streams: [global.testStreamId] })
         .addUpdateMethod(new pryv.Monitor.UpdateMethod.Socket());
       await monitor.start();
       let count = 0;

components/pryv-monitor/test/timer.test.js

@@ -28,7 +28,7 @@ describe('[TIMX] Monitor + EventsTimer', function () {
 
   describe('[TUPX] timer updates', () => {
     it('[TUPA] Detect new events added', async function () {
-      const monitor = new pryv.Monitor(apiEndpoint, { limit: 1 })
+      const monitor = new pryv.Monitor(apiEndpoint, { limit: 1, streams: [global.testStreamId] })
         .addUpdateMethod(new pryv.Monitor.UpdateMethod.EventsTimer(1));
       await monitor.start();
       let count = 0;
@@ -61,7 +61,7 @@ describe('[TIMX] Monitor + EventsTimer', function () {
   describe('[TSTX] stop', () => {
     it('[TSTA] Monitor stops when requested', async function () {
       this.timeout(20000);
-      const monitor = await new pryv.Monitor(apiEndpoint, { limit: 1 })
+      const monitor = await new pryv.Monitor(apiEndpoint, { limit: 1, streams: [global.testStreamId] })
         .addUpdateMethod(new pryv.Monitor.UpdateMethod.EventsTimer(1));
       await monitor.start();