wip: fix tests

Author: Julusian

Diff for: src/internal/__tests__/upgrade.spec.ts

@@ -7,7 +7,7 @@ import {
 	CompanionStaticUpgradeScript,
 } from '../../module-api/upgrade.js'
 import { runThroughUpgradeScripts } from '../upgrade.js'
-import { ActionInstance } from '../../host-api/api.js'
+import { ActionInstance, UpgradeActionInstance } from '../../host-api/api.js'
 
 type MockUpgradeScript<TConfig> = Mock<CompanionStaticUpgradeScript<TConfig>>
 
@@ -32,18 +32,18 @@ const createMockScripts = <TConfig>(count: number): MockUpgradeScript<TConfig>[]
 	return result
 }
 
-function makeActionsInput(...actions: ActionInstance[]): { [id: string]: ActionInstance } {
-	const res: { [id: string]: ActionInstance } = {}
+function makeActionsInput(...actions: UpgradeActionInstance[]): UpgradeActionInstance[] {
+	const res: UpgradeActionInstance[] = []
 
 	for (const action of actions) {
-		if (res[action.id]) throw new Error(`Duplicate id "${action.id}"`)
-		res[action.id] = clone(action)
+		// if (res[action.id]) throw new Error(`Duplicate id "${action.id}"`)
+		res.push(clone(action))
 	}
 
 	return res
 }
 
-function stripActionInstance(action: ActionInstance): CompanionMigrationAction {
+function stripActionInstance(action: UpgradeActionInstance): CompanionMigrationAction {
 	return {
 		id: action.id,
 		controlId: action.controlId,
@@ -61,13 +61,13 @@ describe('runThroughUpgradeScripts', () => {
 
 	it('nothing to upgrade', () => {
 		const scripts = createMockScripts(2)
-		const result = runThroughUpgradeScripts({}, {}, null, scripts, {}, true)
+		const result = runThroughUpgradeScripts([], [], null, scripts, {}, true)
 
 		// Check result looks sane
 		expect(result).toBeTruthy()
 		expect(result.updatedConfig).toBeUndefined()
-		expect(result.updatedActions).toEqual({})
-		expect(result.updatedFeedbacks).toEqual({})
+		expect(result.updatedActions).toEqual([])
+		expect(result.updatedFeedbacks).toEqual([])
 
 		// check scripts
 		expect(scripts).toHaveLength(2)
@@ -81,13 +81,13 @@ describe('runThroughUpgradeScripts', () => {
 			something: true,
 		}
 		const scripts = createMockScripts(2)
-		const result = runThroughUpgradeScripts({}, {}, null, scripts, { ...configBefore }, false)
+		const result = runThroughUpgradeScripts([], [], null, scripts, { ...configBefore }, false)
 
 		// Check result looks sane
 		expect(result).toBeTruthy()
 		expect(result.updatedConfig).toEqual(undefined)
-		expect(result.updatedActions).toEqual({})
-		expect(result.updatedFeedbacks).toEqual({})
+		expect(result.updatedActions).toEqual([])
+		expect(result.updatedFeedbacks).toEqual([])
 
 		// check scripts
 		expect(scripts).toHaveLength(2)
@@ -112,15 +112,15 @@ describe('runThroughUpgradeScripts', () => {
 			})
 		})
 
-		const result = runThroughUpgradeScripts({}, {}, 0, scripts, { ...configBefore }, false)
+		const result = runThroughUpgradeScripts([], [], 0, scripts, { ...configBefore }, false)
 		// Check result looks sane
 		expect(result).toBeTruthy()
 		expect(result.updatedConfig).toEqual({
 			...configBefore,
 			added: 123,
 		})
-		expect(result.updatedActions).toEqual({})
-		expect(result.updatedFeedbacks).toEqual({})
+		expect(result.updatedActions).toEqual([])
+		expect(result.updatedFeedbacks).toEqual([])
 
 		// check scripts
 		expect(scripts).toHaveLength(2)
@@ -138,20 +138,26 @@ describe('runThroughUpgradeScripts', () => {
 	})
 
 	it('just the actions to upgrade, from v0', () => {
-		const action0Before: ActionInstance = {
+		const action0Before: UpgradeActionInstance = {
 			id: 'act0',
 			upgradeIndex: null,
 			disabled: false,
 			actionId: 'my-action',
-			options: { a: 1, b: 2 },
+			options: {
+				a: { value: 1, isExpression: false },
+				b: { value: 2, isExpression: false },
+			},
 			controlId: 'control0',
 		}
-		const action1Before: ActionInstance = {
+		const action1Before: UpgradeActionInstance = {
 			id: 'act1',
 			upgradeIndex: null,
 			disabled: false,
 			actionId: 'my-action',
-			options: { c: 1, d: 2 },
+			options: {
+				c: { value: 1, isExpression: false },
+				d: { value: 2, isExpression: false },
+			},
 			controlId: 'control1',
 		}
 
@@ -175,18 +181,18 @@ describe('runThroughUpgradeScripts', () => {
 		})
 
 		const actionsInput = makeActionsInput(action0Before, action1Before)
-		const result = runThroughUpgradeScripts(actionsInput, {}, 0, scripts, {}, true)
+		const result = runThroughUpgradeScripts(actionsInput, [], 0, scripts, {}, true)
 
 		// Check result looks sane
 		expect(result).toBeTruthy()
 		expect(result.updatedConfig).toBeUndefined()
-		expect(result.updatedActions).toEqual({
-			[action0Before.id]: {
+		expect(result.updatedActions).toEqual([
+			{
 				...action0Before,
 				actionId: 'new-action',
 			},
-		})
-		expect(result.updatedFeedbacks).toEqual({})
+		])
+		expect(result.updatedFeedbacks).toEqual([])
 
 		// check scripts
 		expect(scripts).toHaveLength(2)
@@ -195,25 +201,31 @@ describe('runThroughUpgradeScripts', () => {
 
 		// Check input was mutated in place
 		const expectedInput = makeActionsInput(action0Before, action1Before)
-		expectedInput[action0Before.id].actionId = 'new-action'
+		expectedInput[0].actionId = 'new-action'
 		expect(actionsInput).toEqual(expectedInput)
 	})
 
 	it('an actions to upgrade, from earlier than the rest', () => {
-		const action0Before: ActionInstance = {
+		const action0Before: UpgradeActionInstance = {
 			id: 'act0',
 			upgradeIndex: null,
 			disabled: false,
 			actionId: 'my-action',
-			options: { a: 1, b: 2 },
+			options: {
+				a: { value: 1, isExpression: false },
+				b: { value: 2, isExpression: false },
+			},
 			controlId: 'control0',
 		}
-		const action1Before: ActionInstance = {
+		const action1Before: UpgradeActionInstance = {
 			id: 'act1',
 			upgradeIndex: -1,
 			disabled: false,
 			actionId: 'my-action',
-			options: { c: 1, d: 2 },
+			options: {
+				c: { value: 1, isExpression: false },
+				d: { value: 2, isExpression: false },
+			},
 			controlId: 'control1',
 		}
 
@@ -236,22 +248,22 @@ describe('runThroughUpgradeScripts', () => {
 		})
 
 		const actionsInput = makeActionsInput(action0Before, action1Before)
-		const result = runThroughUpgradeScripts(actionsInput, {}, 0, scripts, {}, true)
+		const result = runThroughUpgradeScripts(actionsInput, [], 0, scripts, {}, true)
 
 		// Check result looks sane
 		expect(result).toBeTruthy()
 		expect(result.updatedConfig).toBeUndefined()
-		expect(result.updatedActions).toEqual({
-			[action0Before.id]: {
+		expect(result.updatedActions).toEqual([
+			{
 				...action0Before,
 				actionId: 'new-action',
 			},
-			[action1Before.id]: {
+			{
 				// Reported to confirm the upgrade
 				...action1Before,
 			},
-		})
-		expect(result.updatedFeedbacks).toEqual({})
+		])
+		expect(result.updatedFeedbacks).toEqual([])
 
 		// check scripts
 		expect(scripts).toHaveLength(2)
@@ -261,7 +273,7 @@ describe('runThroughUpgradeScripts', () => {
 
 		// Check input was mutated in place
 		const expectedInput = makeActionsInput(action0Before, action1Before)
-		expectedInput[action0Before.id].actionId = 'new-action'
+		expectedInput[0].actionId = 'new-action'
 		expect(actionsInput).toEqual(expectedInput)
 	})
 })