wip: remove old testInFiber and related methods

Author: Julusian

meteor/__mocks__/helpers/jest.ts

@@ -1,46 +1,3 @@
-/* eslint-disable jest/no-export, jest/valid-title, jest/expect-expect, jest/no-focused-tests */
-
-export function beforeAllInFiber(fcn: () => void | Promise<void>, timeout?: number): void {
-	beforeAll(async () => {
-		await fcn()
-	}, timeout)
-}
-export function afterAllInFiber(fcn: () => void | Promise<void>, timeout?: number): void {
-	afterAll(async () => {
-		await fcn()
-	}, timeout)
-}
-export function beforeEachInFiber(fcn: () => void | Promise<void>, timeout?: number): void {
-	beforeEach(async () => {
-		await fcn()
-	}, timeout)
-}
-export function afterEachInFiber(fcn: () => void | Promise<void>, timeout?: number): void {
-	afterEach(async () => {
-		await fcn()
-	}, timeout)
-}
-
-export function testInFiber(testName: string, fcn: () => void | Promise<void>, timeout?: number): void {
-	test(
-		testName,
-		async () => {
-			await fcn()
-		},
-		timeout
-	)
-}
-
-export function testInFiberOnly(testName: string, fcn: () => void | Promise<void>, timeout?: number): void {
-	// eslint-disable-next-line custom-rules/no-focused-test
-	test.only(
-		testName,
-		async () => {
-			await fcn()
-		},
-		timeout
-	)
-}
 const orgSetTimeout = setTimeout
 const DateOrg = Date
 export async function runAllTimers(): Promise<void> {

meteor/server/__tests__/_testEnvironment.test.ts

@@ -2,7 +2,6 @@ import { RandomMock } from '../../__mocks__/random'
 import { MongoMock } from '../../__mocks__/mongo'
 import { protectString, getRandomString } from '../lib/tempLib'
 import { sleep } from '../lib/lib'
-import { testInFiber } from '../../__mocks__/helpers/jest'
 import {
 	AdLibPieces,
 	Blueprints,
@@ -147,7 +146,7 @@ describe('Basic test of test environment', () => {
 		MongoMock.mockSetData(Studios, null)
 		expect(await Studios.findFetchAsync({})).toHaveLength(0)
 	})
-	testInFiber('Mongo mock', async () => {
+	test('Mongo mock', async () => {
 		const mockAdded = jest.fn()
 		const mockChanged = jest.fn()
 		const mockRemoved = jest.fn()

meteor/server/__tests__/coreSystem.test.ts

@@ -1,8 +1,7 @@
-import { testInFiber } from '../../__mocks__/helpers/jest'
 import { RelevantSystemVersions } from '../coreSystem'
 
 describe('coreSystem', () => {
-	testInFiber('RelevantSystemVersions', async () => {
+	test('RelevantSystemVersions', async () => {
 		const versions = await RelevantSystemVersions
 
 		expect(versions).toEqual({

meteor/server/__tests__/cronjobs.test.ts

@@ -1,5 +1,5 @@
 import '../../__mocks__/_extendJest'
-import { testInFiber, runAllTimers, beforeAllInFiber, waitUntil } from '../../__mocks__/helpers/jest'
+import { runAllTimers, waitUntil } from '../../__mocks__/helpers/jest'
 import { MeteorMock } from '../../__mocks__/meteor'
 import { logger } from '../logging'
 import { getRandomId, getRandomString, protectString } from '../lib/tempLib'
@@ -69,7 +69,7 @@ describe('cronjobs', () => {
 	let env: DefaultEnvironment
 	let rundownId: RundownId
 
-	beforeAllInFiber(async () => {
+	beforeAll(async () => {
 		env = await setupDefaultStudioEnvironment()
 
 		const o = await setupDefaultRundownPlaylist(env)
@@ -101,7 +101,7 @@ describe('cronjobs', () => {
 		await CoreSystem.removeAsync(SYSTEM_ID)
 	})
 	describe('Runs at the appropriate time', () => {
-		testInFiber("Doesn't run during the day", async () => {
+		test("Doesn't run during the day", async () => {
 			// set time to 2020/07/19 12:00 Local Time
 			mockCurrentTime = new Date(2020, 6, 19, 12, 0, 0).getTime()
 			// cronjob is checked every 5 minutes, so advance 6 minutes
@@ -112,7 +112,7 @@ describe('cronjobs', () => {
 
 			expect(logger.info).toHaveBeenCalledTimes(0)
 		})
-		testInFiber("Runs at 4 o'clock", async () => {
+		test("Runs at 4 o'clock", async () => {
 			// set time to 2020/07/20 04:05 Local Time, should be more than 24 hours after 2020/07/19 00:00 UTC
 			mockCurrentTime = new Date(2020, 6, 20, 4, 5, 0).getTime()
 			// cronjob is checked every 5 minutes, so advance 6 minutes
@@ -127,7 +127,7 @@ describe('cronjobs', () => {
 				expect(logger.info).toHaveBeenLastCalledWith('Nightly cronjob: done')
 			}, MAX_WAIT_TIME)
 		})
-		testInFiber("Doesn't run if less than 20 hours have passed since last run", async () => {
+		test("Doesn't run if less than 20 hours have passed since last run", async () => {
 			// set time to 2020/07/21 04:05 Local Time, should be more than 24 hours after 2020/07/19 00:00 UTC
 			mockCurrentTime = new Date(2020, 6, 21, 4, 5, 0).getTime()
 			// cronjob is checked every 5 minutes, so advance 6 minutes
@@ -173,7 +173,7 @@ describe('cronjobs', () => {
 			await PeripheralDevices.removeAsync({})
 		})
 
-		testInFiber('Remove NrcsIngestDataCache objects that are not connected to any Rundown', async () => {
+		test('Remove NrcsIngestDataCache objects that are not connected to any Rundown', async () => {
 			// Set up a mock rundown, a detached NrcsIngestDataCache object and an object attached to the mock rundown
 			// Detached NrcsIngestDataCache object 0
 			const dataCache0Id = protectString<NrcsIngestDataCacheObjId>(getRandomString())
@@ -217,7 +217,7 @@ describe('cronjobs', () => {
 			})
 			expect(await NrcsIngestDataCache.findOneAsync(dataCache0Id)).toBeUndefined()
 		})
-		testInFiber('Remove SofieIngestDataCache objects that are not connected to any Rundown', async () => {
+		test('Remove SofieIngestDataCache objects that are not connected to any Rundown', async () => {
 			// Set up a mock rundown, a detached SofieIngestDataCache object and an object attached to the mock rundown
 			// Detached SofieIngestDataCache object 0
 			const dataCache0Id = protectString<SofieIngestDataCacheObjId>(getRandomString())
@@ -263,7 +263,7 @@ describe('cronjobs', () => {
 			})
 			expect(await SofieIngestDataCache.findOneAsync(dataCache0Id)).toBeUndefined()
 		})
-		testInFiber('Removes old PartInstances and PieceInstances', async () => {
+		test('Removes old PartInstances and PieceInstances', async () => {
 			// nightlyCronjobInner()
 
 			const segment0: DBSegment = {
@@ -396,7 +396,7 @@ describe('cronjobs', () => {
 			expect(await PieceInstances.findOneAsync(pieceInstance0._id)).toBeDefined()
 			expect(await PieceInstances.findOneAsync(pieceInstance1._id)).toBeUndefined() // Removed, since owned by non-existent partInstance2
 		})
-		testInFiber('Removes old entries in UserActionsLog', async () => {
+		test('Removes old entries in UserActionsLog', async () => {
 			// reasonably fresh entry
 			const userAction0 = protectString<UserActionsLogItemId>(getRandomString())
 			await UserActionsLog.insertAsync({
@@ -430,7 +430,7 @@ describe('cronjobs', () => {
 			})
 			expect(await UserActionsLog.findOneAsync(userAction1)).toBeUndefined()
 		})
-		testInFiber('Removes old entries in Snapshots', async () => {
+		test('Removes old entries in Snapshots', async () => {
 			// reasonably fresh entry
 			const snapshot0 = protectString<SnapshotId>(getRandomString())
 			await Snapshots.insertAsync({
@@ -524,7 +524,7 @@ describe('cronjobs', () => {
 			}
 		}
 
-		testInFiber('Attempts to restart CasparCG when job is enabled', async () => {
+		test('Attempts to restart CasparCG when job is enabled', async () => {
 			const { mockCasparCg } = await createMockPlayoutGatewayAndDevices(Date.now()) // Some time after the threshold
 
 			;(logger.info as jest.Mock).mockClear()
@@ -563,7 +563,7 @@ describe('cronjobs', () => {
 				expect(logger.info).toHaveBeenLastCalledWith('Nightly cronjob: done')
 			}, MAX_WAIT_TIME)
 		})
-		testInFiber('Skips offline CasparCG when job is enabled', async () => {
+		test('Skips offline CasparCG when job is enabled', async () => {
 			const { mockCasparCg } = await createMockPlayoutGatewayAndDevices(Date.now()) // Some time after the threshold
 			await PeripheralDevices.updateAsync(mockCasparCg, {
 				$set: {
@@ -589,7 +589,7 @@ describe('cronjobs', () => {
 				expect(logger.info).toHaveBeenLastCalledWith('Nightly cronjob: done')
 			}, MAX_WAIT_TIME)
 		})
-		testInFiber('Does not attempt to restart CasparCG when job is disabled', async () => {
+		test('Does not attempt to restart CasparCG when job is disabled', async () => {
 			await createMockPlayoutGatewayAndDevices(Date.now()) // Some time after the threshold
 			await CoreSystem.updateAsync(
 				{},

meteor/server/__tests__/logging.test.ts

@@ -1,10 +1,9 @@
-import { testInFiber } from '../../__mocks__/helpers/jest'
 import { supressLogging } from '../../__mocks__/helpers/lib'
 import { SupressLogMessages } from '../../__mocks__/suppressLogging'
 import { logger } from '../logging'
 
 describe('server/logger', () => {
-	testInFiber('supress errors', async () => {
+	test('supress errors', async () => {
 		const logMessages = () => {
 			logger.debug('This is a debug message')
 			logger.info('This is an info message')
@@ -20,7 +19,7 @@ describe('server/logger', () => {
 		expect(1).toBe(1)
 	})
 
-	testInFiber('logger', () => {
+	test('logger', () => {
 		expect(typeof logger.error).toEqual('function')
 		expect(typeof logger.warn).toEqual('function')
 		// expect(typeof logger.help).toEqual('function')

meteor/server/__tests__/systemTime.test.ts

@@ -1,8 +1,8 @@
-import { runTimersUntilNow, testInFiber } from '../../__mocks__/helpers/jest'
+import { runTimersUntilNow } from '../../__mocks__/helpers/jest'
 import { TimeJumpDetector } from '../systemTime'
 
 describe('lib/systemTime', () => {
-	testInFiber('TimeJumpDetector', async () => {
+	test('TimeJumpDetector', async () => {
 		jest.useFakeTimers()
 		const mockCallback = jest.fn()
 		let now = Date.now()

meteor/server/api/__tests__/cleanup.test.ts

@@ -1,5 +1,4 @@
 import { getRandomId } from '../../lib/tempLib'
-import { beforeEachInFiber, testInFiber } from '../../../__mocks__/helpers/jest'
 
 import '../../collections' // include this in order to get all of the collection set up
 import { cleanupOldDataInner } from '../cleanup'
@@ -56,12 +55,12 @@ import { DBNotificationTargetType } from '@sofie-automation/corelib/dist/dataMod
 describe('Cleanup', () => {
 	let env: DefaultEnvironment
 
-	beforeEachInFiber(async () => {
+	beforeEach(async () => {
 		await clearAllDBCollections()
 		env = await setupDefaultStudioEnvironment()
 	})
 
-	testInFiber('Check that all collections are covered', async () => {
+	test('Check that all collections are covered', async () => {
 		expect(Collections.size).toBeGreaterThan(10)
 
 		const result = await cleanupOldDataInner(false)
@@ -73,7 +72,7 @@ describe('Cleanup', () => {
 		}
 	})
 
-	testInFiber('No bad removals', async () => {
+	test('No bad removals', async () => {
 		// Check that cleanupOldDataInner() doesn't remove any data when the default data set is in the DB.
 
 		await setDefaultDatatoDB(env, Date.now())
@@ -94,7 +93,7 @@ describe('Cleanup', () => {
 		expect(await RundownPlaylists.countDocuments()).toBe(1)
 		expect(await Rundowns.countDocuments()).toBe(1)
 	})
-	testInFiber('All dependants should be removed', async () => {
+	test('All dependants should be removed', async () => {
 		// Check that cleanupOldDataInner() cleans up all data from the database.
 
 		await setDefaultDatatoDB(env, 0)
@@ -137,7 +136,7 @@ describe('Cleanup', () => {
 			}
 		}
 	})
-	testInFiber('PieceInstance should be removed when PartInstance is removed', async () => {
+	test('PieceInstance should be removed when PartInstance is removed', async () => {
 		// Check that cleanupOldDataInner() cleans up all data from the database.
 
 		await setDefaultDatatoDB(env, 0)