wip: add back sync mock mongo methods for tests

Author: Julusian

meteor/__mocks__/mongo.ts

@@ -9,6 +9,7 @@ import type { AnyBulkWriteOperation } from 'mongodb'
 import {
 	FindOneOptions,
 	FindOptions,
+	MongoCursor,
 	MongoReadOnlyCollection,
 	ObserveCallbacks,
 	ObserveChangesCallbacks,
@@ -44,6 +45,7 @@ export namespace MongoMock {
 	const mockCollections: MockCollections<any> = {}
 	export class Collection<T extends CollectionObject> implements Omit<MinimalMeteorMongoCollection<T>, 'find'> {
 		public _name: string
+		private _isTemporaryCollection: boolean
 		private _options: any = {}
 		// @ts-expect-error used in test to check that it's a mock
 		private _isMock = true as const
@@ -54,11 +56,15 @@ export namespace MongoMock {
 		constructor(name: string | null, options?: { transform?: never }) {
 			this._options = options || {}
 			this._name = name || getRandomString() // If `null`, then its an in memory unique collection
+			this._isTemporaryCollection = name === null
 
 			if (this._options.transform) throw new Error('document transform is no longer supported')
 		}
 
-		find(query: any, options?: FindOptions<T>): MinimalMongoCursor<T> & { _fetchRaw: () => T[] } {
+		find(
+			query: any,
+			options?: FindOptions<T>
+		): MinimalMongoCursor<T> & { _fetchRaw: () => T[] } & Pick<MongoCursor<T>, 'fetch' | 'forEach'> {
 			if (_.isString(query)) query = { _id: query }
 			query = query || {}
 
@@ -97,6 +103,12 @@ export namespace MongoMock {
 
 					return clone(docs)
 				},
+				fetch: () => {
+					if (!this._isTemporaryCollection)
+						throw new Meteor.Error(500, 'sync methods can only be used for unnamed collections')
+
+					return clone(docs)
+				},
 				countAsync: async () => {
 					// Force this to be performed async
 					await MeteorMock.sleepNoFakeTimers(0)
@@ -140,9 +152,12 @@ export namespace MongoMock {
 						},
 					}
 				},
-				// async forEachAsync(f: any) {
-				// 	docs.forEach(f)
-				// },
+				forEach: (f: any) => {
+					if (!this._isTemporaryCollection)
+						throw new Meteor.Error(500, 'sync methods can only be used for unnamed collections')
+
+					docs.forEach(f)
+				},
 				// async mapAsync(f: any) {
 				// 	return docs.map(f)
 				// },
@@ -152,10 +167,28 @@ export namespace MongoMock {
 			const docs = await this.find(query, options).fetchAsync()
 			return docs[0]
 		}
+		findOne(query: MongoQuery<T>, options?: FindOneOptions<T>) {
+			if (!this._isTemporaryCollection)
+				throw new Meteor.Error(500, 'sync methods can only be used for unnamed collections')
+
+			const docs = this.find(query, options).fetch()
+			return docs[0]
+		}
+
 		async updateAsync(query: any, modifier: any, options?: UpdateOptions): Promise<number> {
 			// Force this to be performed async
 			await MeteorMock.sleepNoFakeTimers(0)
 
+			return this.updateRaw(query, modifier, options)
+		}
+		update(query: any, modifier: any, options?: UpdateOptions): number {
+			if (!this._isTemporaryCollection)
+				throw new Meteor.Error(500, 'sync methods can only be used for unnamed collections')
+
+			return this.updateRaw(query, modifier, options)
+		}
+
+		private updateRaw(query: any, modifier: any, options?: UpdateOptions): number {
 			const unimplementedUsedOptions = _.without(_.keys(options), 'multi')
 			if (unimplementedUsedOptions.length > 0) {
 				throw new Error(`update being performed using unimplemented options: ${unimplementedUsedOptions}`)
@@ -189,10 +222,20 @@ export namespace MongoMock {
 
 			return docs.length
 		}
+
 		async insertAsync(doc: any): Promise<string> {
 			// Force this to be performed async
 			await MeteorMock.sleepNoFakeTimers(0)
 
+			return this.insertRaw(doc)
+		}
+		insert(doc: any): string {
+			if (!this._isTemporaryCollection)
+				throw new Meteor.Error(500, 'sync methods can only be used for unnamed collections')
+
+			return this.insertRaw(doc)
+		}
+		private insertRaw(doc: any): string {
 			const d = _.clone(doc)
 			if (!d._id) d._id = protectString(RandomMock.id())
 
@@ -221,6 +264,7 @@ export namespace MongoMock {
 
 			return d._id
 		}
+
 		async upsertAsync(
 			query: any,
 			modifier: any,
@@ -229,23 +273,50 @@ export namespace MongoMock {
 			// Force this to be performed async
 			await MeteorMock.sleepNoFakeTimers(0)
 
+			return this.upsertRaw(query, modifier, options)
+		}
+		upsert(
+			query: any,
+			modifier: any,
+			options?: UpsertOptions
+		): { numberAffected: number | undefined; insertedId: string | undefined } {
+			if (!this._isTemporaryCollection)
+				throw new Meteor.Error(500, 'sync methods can only be used for unnamed collections')
+
+			return this.upsertRaw(query, modifier, options)
+		}
+		private upsertRaw(
+			query: any,
+			modifier: any,
+			options?: UpsertOptions
+		): { numberAffected: number | undefined; insertedId: string | undefined } {
 			const id = _.isString(query) ? query : query._id
 
 			const docs = this.find(id)._fetchRaw()
 
 			if (docs.length) {
-				const count = await this.updateAsync(docs[0]._id, modifier, options)
+				const count = this.updateRaw(docs[0]._id, modifier, options)
 				return { insertedId: undefined, numberAffected: count }
 			} else {
 				const doc = mongoModify<T>(query, { _id: id } as any, modifier)
-				const insertedId = await this.insertAsync(doc)
+				const insertedId = this.insertRaw(doc)
 				return { insertedId: insertedId, numberAffected: undefined }
 			}
 		}
+
 		async removeAsync(query: any): Promise<number> {
 			// Force this to be performed async
 			await MeteorMock.sleepNoFakeTimers(0)
 
+			return this.removeRaw(query)
+		}
+		remove(query: any): number {
+			if (!this._isTemporaryCollection)
+				throw new Meteor.Error(500, 'sync methods can only be used for unnamed collections')
+
+			return this.removeRaw(query)
+		}
+		private removeRaw(query: any): number {
 			const docs = this.find(query)._fetchRaw()
 
 			_.each(docs, (doc) => {

meteor/server/api/__tests__/userActions/general.test.ts

@@ -1,7 +1,7 @@
 import '../../../../__mocks__/_extendJest'
 import { setupDefaultStudioEnvironment } from '../../../../__mocks__/helpers/database'
 import { hashSingleUseToken } from '../../deviceTriggers/triggersContext'
-import { getCurrentTime } from '../../../lib/lib'
+import { getCurrentTime, sleep } from '../../../lib/lib'
 import { MeteorCall } from '../../methods'
 import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { UserActionsLog } from '../../../collections'
@@ -50,6 +50,7 @@ describe('User Actions - General', () => {
 		await expect(MeteorCall.userAction.guiFocused('click', getCurrentTime())).resolves.toMatchObject({
 			success: 200,
 		})
+		await sleep(0)
 		const logs0 = await UserActionsLog.findFetchAsync({
 			method: 'guiFocused',
 		})
@@ -61,6 +62,7 @@ describe('User Actions - General', () => {
 		await expect(MeteorCall.userAction.guiBlurred('click', getCurrentTime())).resolves.toMatchObject({
 			success: 200,
 		})
+		await sleep(0)
 		const logs1 = await UserActionsLog.findFetchAsync({
 			method: 'guiBlurred',
 		})