From 2f85dcf6bc85212d3d57429cb8e949e91860ede2 Mon Sep 17 00:00:00 2001 From: denihs Date: Wed, 26 Jun 2024 16:52:20 -0400 Subject: [PATCH] - fix test environment - bindEnvironment --- .../accounts-2fa/.npm/package/npm-shrinkwrap.json | 6 +++--- packages/ddp-server/livedata_server.js | 2 +- packages/email/.npm/package/npm-shrinkwrap.json | 6 +++--- packages/meteor/dynamics_nodejs.js | 8 ++++++-- packages/meteor/dynamics_test.js | 6 +++--- packages/npm-mongo/.npm/package/npm-shrinkwrap.json | 6 +++--- packages/webapp/.npm/package/npm-shrinkwrap.json | 12 ++++++------ 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json index 0097b01153..deed5da151 100644 --- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json +++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json @@ -2,9 +2,9 @@ "lockfileVersion": 4, "dependencies": { "@types/node": { - "version": "20.14.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", - "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==" + "version": "20.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", + "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==" }, "@types/notp": { "version": "2.0.5", diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js index 0b9d0b43dc..fce6e031a1 100644 --- a/packages/ddp-server/livedata_server.js +++ b/packages/ddp-server/livedata_server.js @@ -1203,7 +1203,7 @@ Object.assign(Subscription.prototype, { // Both conventional and async publish handler functions are supported. // If an object is returned with a then() function, it is either a promise // or thenable and will be resolved asynchronously. - const isThenable = + const isThenable = resultOrThenable && typeof resultOrThenable.then === 'function'; if (isThenable) { try { diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json index aadffd7f34..f60b526522 100644 --- a/packages/email/.npm/package/npm-shrinkwrap.json +++ b/packages/email/.npm/package/npm-shrinkwrap.json @@ -2,9 +2,9 @@ "lockfileVersion": 4, "dependencies": { "@types/node": { - "version": "20.14.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", - "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==" + "version": "20.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", + "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==" }, "@types/nodemailer": { "version": "6.4.14", diff --git a/packages/meteor/dynamics_nodejs.js b/packages/meteor/dynamics_nodejs.js index 699fa96759..f98d28ab3a 100644 --- a/packages/meteor/dynamics_nodejs.js +++ b/packages/meteor/dynamics_nodejs.js @@ -60,10 +60,14 @@ class EnvironmentVariableAsync { } return Meteor._runAsync( - function () { + async function () { + let ret; Meteor._updateAslStore(CURRENT_VALUE_KEY_NAME, value); Meteor._updateAslStore(UPPER_CALL_DYNAMICS_KEY_NAME, dynamics); - return func(); + // Here we should await the result of func() instead of + // return func(); because the ret may be another Promise. + ret = await func(); + return ret; }, self, Object.assign( diff --git a/packages/meteor/dynamics_test.js b/packages/meteor/dynamics_test.js index 8e68294373..aa34622e5c 100644 --- a/packages/meteor/dynamics_test.js +++ b/packages/meteor/dynamics_test.js @@ -117,9 +117,9 @@ Tinytest.addAsync("environment - bindEnvironment", async function (test) { // Inside a withValue - await CurrentFoo.withValue(22, async function () { + await CurrentFoo.withValue(22, function () { test.equal(CurrentFoo.get(), 22); - await test_f(); + test_f(); test.equal(CurrentFoo.get(), 22); }); @@ -228,4 +228,4 @@ Tinytest.add('environment - consistent ev value', function (test) { let ev1 = new Meteor.EnvironmentVariable(); const ret = ev1.withValue(10, () => 5); test.equal(ret, 5); -}) \ No newline at end of file +}) diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json index 9f95fc1def..daad8f982a 100644 --- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json +++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json @@ -381,9 +381,9 @@ "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==" }, "@types/node": { - "version": "20.14.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.7.tgz", - "integrity": "sha512-uTr2m2IbJJucF3KUxgnGOZvYbN0QgkGyWxG6973HCpMYFy2KfcgYuIwkJQMQkt1VbBMlvWRbpshFTLxnxCZjKQ==" + "version": "20.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", + "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==" }, "@types/webidl-conversions": { "version": "7.0.3", diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json index 1de22ca76e..058335791d 100644 --- a/packages/webapp/.npm/package/npm-shrinkwrap.json +++ b/packages/webapp/.npm/package/npm-shrinkwrap.json @@ -32,9 +32,9 @@ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" }, "@types/node": { - "version": "20.14.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.7.tgz", - "integrity": "sha512-uTr2m2IbJJucF3KUxgnGOZvYbN0QgkGyWxG6973HCpMYFy2KfcgYuIwkJQMQkt1VbBMlvWRbpshFTLxnxCZjKQ==" + "version": "20.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", + "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==" }, "@types/qs": { "version": "6.9.15", @@ -378,9 +378,9 @@ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==" }, "object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==" }, "on-finished": { "version": "2.4.1",