From bc45bcf247b2dc6dfeef94c7c35bbee53afdc2cc Mon Sep 17 00:00:00 2001 From: Leonardo Venturini Date: Thu, 5 Oct 2023 10:26:51 -0400 Subject: [PATCH] ignore async event in tests instead --- .gitignore | 1 + lib/hijack/async.js | 1 + tests/_helpers/helpers.js | 7 ++++--- tests/hijack/db.js | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3a18cb14..e9313b84 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ versions.json .idea .eslintcache .envrc +/packages/* \ No newline at end of file diff --git a/lib/hijack/async.js b/lib/hijack/async.js index 0da09cc8..8082b4f7 100644 --- a/lib/hijack/async.js +++ b/lib/hijack/async.js @@ -24,6 +24,7 @@ export function wrapFibers () { wrapped = true; let originalYield = Fibers.yield; + Fibers.yield = function () { let kadiraInfo = Kadira._getInfo(); if (kadiraInfo) { diff --git a/tests/_helpers/helpers.js b/tests/_helpers/helpers.js index 509c60dd..89104c3c 100644 --- a/tests/_helpers/helpers.js +++ b/tests/_helpers/helpers.js @@ -1,9 +1,10 @@ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { DDP } from 'meteor/ddp'; -const Future = Npm.require('fibers/future'); import { MethodStore, TestData } from './globals'; +const Future = Npm.require('fibers/future'); + export const GetMeteorClient = function (_url) { const url = _url || Meteor.absoluteUrl(); return DDP.connect(url, {retry: false}); @@ -31,7 +32,7 @@ export const EnableTrackingMethods = function () { // }; }; -export const GetLastMethodEvents = function (_indices) { +export const GetLastMethodEvents = function (_indices, ignore = []) { if (MethodStore.length < 1) { return []; } @@ -43,7 +44,7 @@ export const GetLastMethodEvents = function (_indices) { return events; function isNotCompute (event) { - return event[0] !== 'compute'; + return event[0] !== 'compute' && !ignore.includes(event[0]); } function filterFields (event) { diff --git a/tests/hijack/db.js b/tests/hijack/db.js index 7113940a..598c4927 100644 --- a/tests/hijack/db.js +++ b/tests/hijack/db.js @@ -138,7 +138,7 @@ Tinytest.add( }); let client = GetMeteorClient(); let result = client.call(methodId); - let events = GetLastMethodEvents([0, 2]); + let events = GetLastMethodEvents([0, 2], ['async']); let expected = [ ['start',undefined,{userId: null, params: '[]'}], ['wait',undefined,{waitOn: []}], @@ -174,7 +174,7 @@ Tinytest.add( }); let client = GetMeteorClient(); let result = client.call(methodId); - let events = GetLastMethodEvents([0, 2]); + let events = GetLastMethodEvents([0, 2], ['async']); let expected = [ ['start',undefined,{userId: null, params: '[]'}], ['wait',undefined,{waitOn: []}],