chore: fix tests

Author: mint-dewit

src/resolvers/__tests__/downstreamKeyer.spec.ts

@@ -27,7 +27,7 @@ const fullDiff: Required<DiffDownstreamKeyer> = {
 }
 
 test('Unit: Downstream keyer: same state gives no commands', function () {
-	const commands = resolveDownstreamKeyerState(DSK1, DSK1, fullDiff)
+	const { commands } = resolveDownstreamKeyerState(DSK1, DSK1, fullDiff)
 	expect(commands).toHaveLength(0)
 })
 
@@ -38,7 +38,7 @@ test('Unit: Downstream keyer: auto and onAir commands', function () {
 		isAuto: true,
 	}
 
-	const commands = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
+	const { commands } = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
 	expect(commands).toHaveLength(2)
 
 	const firstCommand = commands[0] as Commands.DownstreamKeyOnAirCommand
@@ -63,7 +63,7 @@ test('Unit: Downstream keyer: sources', function () {
 	DSK2[0].sources.fillSource = 1
 	DSK2[1].sources.cutSource = 2
 
-	const commands = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
+	const { commands } = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
 	expect(commands).toHaveLength(2)
 
 	const firstCommand = commands[0] as Commands.DownstreamKeyFillSourceCommand
@@ -86,7 +86,7 @@ test('Unit: Downstream keyer: sources', function () {
 
 test('Unit: Downstream keyer: rate', function () {
 	DSK2[0].properties.rate = 50
-	const commands = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
+	const { commands } = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
 	expect(commands).toHaveLength(1)
 
 	const firstCommand = commands[0] as Commands.DownstreamKeyRateCommand
@@ -100,7 +100,7 @@ test('Unit: Downstream keyer: rate', function () {
 
 test('Unit: Downstream keyer: tie', function () {
 	DSK2[0].properties.tie = true
-	const commands = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
+	const { commands } = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
 	expect(commands).toHaveLength(1)
 
 	const firstCommand = commands[0] as Commands.DownstreamKeyTieCommand
@@ -117,7 +117,7 @@ test('Unit: Downstream keyer: properties', function () {
 	DSK2[0].properties.clip = 500
 	DSK2[0].properties.gain = 50
 	DSK2[0].properties.invert = true
-	const commands = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
+	const { commands } = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
 	expect(commands).toHaveLength(1)
 
 	const firstCommand = commands[0] as Commands.DownstreamKeyGeneralCommand
@@ -143,7 +143,7 @@ test('Unit: Downstream keyer: mask', function () {
 		left: 3,
 		right: 4,
 	}
-	const commands = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
+	const { commands } = resolveDownstreamKeyerState(DSK1, DSK2, fullDiff)
 	expect(commands).toHaveLength(1)
 
 	const firstCommand = commands[0] as Commands.DownstreamKeyMaskCommand

src/resolvers/upstreamKeyers/__tests__/upstreamKeyer.spec.ts

@@ -16,26 +16,36 @@ const fullDiffOptions = (DiffAllObject().video?.mixEffects as DiffMixEffect).ups
 
 test('Unit: upstream keyers: same state gives no commands', function () {
 	// same state gives no commands:
-	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, fullDiffOptions)
+	const { commands } = USK.resolveUpstreamKeyerState(
+		0,
+		ME1.upstreamKeyers,
+		ME2.upstreamKeyers,
+		undefined,
+		fullDiffOptions
+	)
 	expect(commands).toHaveLength(0)
 })
 
 test('Unit: upstream keyers: undefined gives no error', function () {
 	// same state gives no commands:
 	const usk = ME2.upstreamKeyers[0]
 	delete ME2.upstreamKeyers[0]
-	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, fullDiffOptions)
+	const { commands } = USK.resolveUpstreamKeyerState(
+		0,
+		ME1.upstreamKeyers,
+		ME2.upstreamKeyers,
+		undefined,
+		fullDiffOptions
+	)
 	expect(commands).toHaveLength(0)
 	ME2.upstreamKeyers[0] = usk
 })
 
 test('Unit: upstream keyers: sources', function () {
 	USK2.cutSource = 1
 	USK2.fillSource = 2
-	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, fullDiffOptions) as [
-		Commands.MixEffectKeyFillSourceSetCommand,
-		Commands.DownstreamKeyCutSourceCommand
-	]
+	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, undefined, fullDiffOptions)
+		.commands as [Commands.MixEffectKeyFillSourceSetCommand, Commands.DownstreamKeyCutSourceCommand]
 	expect(commands).toHaveLength(2)
 
 	expect(commands[0].constructor.name).toEqual('MixEffectKeyFillSourceSetCommand')
@@ -59,9 +69,8 @@ test('Unit: upstream keyers: sources', function () {
 
 test('Unit: upstream keyers: key type', function () {
 	USK2.mixEffectKeyType = Enums.MixEffectKeyType.Pattern
-	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, fullDiffOptions) as [
-		Commands.MixEffectKeyTypeSetCommand
-	]
+	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, undefined, fullDiffOptions)
+		.commands as [Commands.MixEffectKeyTypeSetCommand]
 	expect(commands).toHaveLength(1)
 
 	expect(commands[0].constructor.name).toEqual('MixEffectKeyTypeSetCommand')
@@ -76,9 +85,8 @@ test('Unit: upstream keyers: key type', function () {
 
 test('Unit: upstream keyers: flyKey enabled', function () {
 	USK2.flyEnabled = !USK1.flyEnabled
-	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, fullDiffOptions) as [
-		Commands.MixEffectKeyTypeSetCommand
-	]
+	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, undefined, fullDiffOptions)
+		.commands as [Commands.MixEffectKeyTypeSetCommand]
 	expect(commands).toHaveLength(1)
 
 	expect(commands[0].constructor.name).toEqual('MixEffectKeyTypeSetCommand')
@@ -93,9 +101,8 @@ test('Unit: upstream keyers: flyKey enabled', function () {
 
 test('Unit: upstream keyers: keyer on air', function () {
 	USK2.onAir = !USK1.onAir
-	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, fullDiffOptions) as [
-		Commands.MixEffectKeyOnAirCommand
-	]
+	const commands = USK.resolveUpstreamKeyerState(0, ME1.upstreamKeyers, ME2.upstreamKeyers, undefined, fullDiffOptions)
+		.commands as [Commands.MixEffectKeyOnAirCommand]
 	expect(commands).toHaveLength(1)
 
 	expect(commands[0].constructor.name).toEqual('MixEffectKeyOnAirCommand')