refactor: use unique collection names in accounts tests and adjust ambiguous error messages

packages/accounts-base/accounts_tests.js

@@ -730,7 +730,7 @@ if (Meteor.isServer) {
     // create same user in two different collections - should pass
     const email = "test-collection@testdomain.com"
 
-    const collection0 = new Mongo.Collection('test1');
+    const collection0 = new Mongo.Collection(`test1_${Random.id()}`);
 
     Accounts.config({
       collection: collection0,
@@ -738,7 +738,7 @@ if (Meteor.isServer) {
     const uid0 = await Accounts.createUser({email})
     await Meteor.users.removeAsync(uid0);
 
-    const collection1 = new Mongo.Collection('test2');
+    const collection1 = new Mongo.Collection(`test2_${Random.id()}`);
     Accounts.config({
       collection: collection1,
     })
@@ -757,13 +757,13 @@ if (Meteor.isServer) {
     const email = "test-collection@testdomain.com"
 
     Accounts.config({
-      collection: 'collection0',
+       collection: `collection0_${Random.id()}`,
     })
     const uid0 = await Accounts.createUser({email})
     await Meteor.users.removeAsync(uid0);
 
     Accounts.config({
-      collection: 'collection1',
+       collection: `collection1_${Random.id()}`,
     })
     const uid1 = await Accounts.createUser({email})
     await Meteor.users.removeAsync(uid1);

packages/accounts-base/accounts_tests_setup.js

@@ -14,6 +14,8 @@ const getTokenFromSecret = async ({ selector, secret: secretParam }) => {
   return token;
 };
 
+Accounts.config({ ambiguousErrorMessages: false });
+
 Meteor.methods({
   async removeAccountsTestUser(username) {
     await Meteor.users.removeAsync({ username });

packages/accounts-password/password_tests.js

@@ -55,6 +55,9 @@ if (Meteor.isClient) (() => {
     Meteor.call('removeSkipCaseInsensitiveChecksForTest', value);
 
   const createUserStep = function (test, expect) {
+    Meteor.logout(expect(_ => {
+      test.equal(Meteor.user(), null);
+    }));
     // Hack because Tinytest does not clean the database between tests/runs
     this.randomSuffix = Random.id(10);
     this.username = `AdaLovelace${ this.randomSuffix }`;
@@ -1300,6 +1303,7 @@ if (Meteor.isServer) (() => {
           await Meteor.callAsync("resetPassword", resetPasswordToken, hashPasswordWithSha("new-password")),
         /Token has invalid email address/
       );
+      Accounts._options.ambiguousErrorMessages = true;
       await test.throwsAsync(
         async () =>
           await Meteor.callAsync(
@@ -1380,6 +1384,7 @@ if (Meteor.isServer) (() => {
         })
       }
 
+      Accounts._options.ambiguousErrorMessages = true;
       await test.throwsAsync(
         async () => await Meteor.callAsync(
           "login",
@@ -1669,6 +1674,7 @@ if (Meteor.isServer) (() => {
       test.isTrue(userId1);
       test.isTrue(userId2);
 
+      Accounts._options.ambiguousErrorMessages = false;
       await test.throwsAsync(
         async () => await Accounts.setUsername(userId2, usernameUpper),
         /Username already exists/