From 662f1ea4398bfc0bf886a18b68dd6317a730f045 Mon Sep 17 00:00:00 2001 From: italo jose Date: Mon, 24 Nov 2025 15:22:53 -0300 Subject: [PATCH] ddp-rate-limiter: simplify createTestUser; call Accounts.createUser directly and remove conditional logout/doCreate --- .../ddp-rate-limiter-tests.js | 27 +++++++++---------- .../ddp-server/livedata_server_async_tests.js | 2 +- packages/minimongo/local_collection.js | 1 - 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/packages/ddp-rate-limiter/ddp-rate-limiter-tests.js b/packages/ddp-rate-limiter/ddp-rate-limiter-tests.js index 98bec40c10..ad31aa0e4a 100644 --- a/packages/ddp-rate-limiter/ddp-rate-limiter-tests.js +++ b/packages/ddp-rate-limiter/ddp-rate-limiter-tests.js @@ -343,24 +343,21 @@ testAsyncMulti('ddp rate limiter - test removing rule with rateLimited ' + function createTestUser(test, expect) { const username = Random.id(); const email = `${Random.id()}-intercept@example.com`; - const password = 'password'; - const ret = { username, email, password } + const password = 'password'; - const doCreate = () => { - Accounts.createUser(ret); - }; - - if (Meteor.userId()) { - Meteor.logout(expect((error) => { + Accounts.createUser( + { + username, + email, + password, + }, + expect((error) => { test.equal(error, undefined); - test.equal(Meteor.user(), null); - doCreate(); - })); - } else { - doCreate(); - } + test.notEqual(Meteor.userId(), null); + }), + ); - return ret; + return { username, email, password }; } /** diff --git a/packages/ddp-server/livedata_server_async_tests.js b/packages/ddp-server/livedata_server_async_tests.js index 18ecabf28a..4ca4ca0864 100644 --- a/packages/ddp-server/livedata_server_async_tests.js +++ b/packages/ddp-server/livedata_server_async_tests.js @@ -169,7 +169,7 @@ Tinytest.addAsync('livedata server - async publish cursor', function( }); clientConn.subscribe('asyncPublishCursor', async () => { const actual = await remoteCollection.find().fetch(); - test.equal(actual[0]?.name, 'async'); + test.equal(actual[0].name, 'async'); onComplete(); }); }); diff --git a/packages/minimongo/local_collection.js b/packages/minimongo/local_collection.js index fcf249f317..fe109b33f7 100644 --- a/packages/minimongo/local_collection.js +++ b/packages/minimongo/local_collection.js @@ -104,7 +104,6 @@ export default class LocalCollection { options.limit = 1; return (await this.find(selector, options).fetchAsync())[0]; } - prepareInsert(doc) { assertHasValidFieldNames(doc);