From 1feb96c8289c2de84a160e416d2f41c568a4e5cf Mon Sep 17 00:00:00 2001 From: benjdlambert Date: Mon, 16 Jun 2025 15:15:47 +0200 Subject: [PATCH] chore: cleanup Signed-off-by: benjdlambert Signed-off-by: benjdlambert --- .../next/services/MockActionsRegistry.test.ts | 26 +++++++++---------- .../src/next/services/MockActionsRegistry.ts | 7 +++-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/packages/backend-test-utils/src/next/services/MockActionsRegistry.test.ts b/packages/backend-test-utils/src/next/services/MockActionsRegistry.test.ts index 28e73d4dc4..e4556cb89e 100644 --- a/packages/backend-test-utils/src/next/services/MockActionsRegistry.test.ts +++ b/packages/backend-test-utils/src/next/services/MockActionsRegistry.test.ts @@ -28,7 +28,7 @@ describe('MockActionsRegistry', () => { const registry = mockServices.actionsRegistry(); registry.register({ - name: 'test', + name: 'my-demo-action', title: 'Test', description: 'Test', schema: { @@ -45,7 +45,7 @@ describe('MockActionsRegistry', () => { }); const result = await registry.invoke({ - id: 'testing:test', + id: 'test:my-demo-action', input: { name: 'test' }, }); @@ -56,7 +56,7 @@ describe('MockActionsRegistry', () => { const registry = mockServices.actionsRegistry(); registry.register({ - name: 'test', + name: 'my-demo-action', title: 'Test', description: 'Test', schema: { @@ -67,8 +67,8 @@ describe('MockActionsRegistry', () => { }); await expect( - registry.invoke({ id: 'testing:test', input: { name: 1 } }), - ).rejects.toThrow('Invalid input to action "testing:test"'); + registry.invoke({ id: 'test:my-demo-action', input: { name: 1 } }), + ).rejects.toThrow('Invalid input to action "test:my-demo-action"'); }); it('should throw an error when the action is not found', async () => { @@ -83,7 +83,7 @@ describe('MockActionsRegistry', () => { const registry = mockServices.actionsRegistry(); registry.register({ - name: 'test', + name: 'my-demo-action', title: 'Test', description: 'Test', schema: { @@ -94,7 +94,7 @@ describe('MockActionsRegistry', () => { }); await expect(registry.invoke({ id: 'test' })).rejects.toThrow( - 'Action "test" not found, available actions: "testing:test"', + 'Action "test" not found, available actions: "test:my-demo-action"', ); }); @@ -102,7 +102,7 @@ describe('MockActionsRegistry', () => { const registry = mockServices.actionsRegistry(); registry.register({ - name: 'test', + name: 'my-demo-action', title: 'Test', description: 'Test', schema: { @@ -114,15 +114,15 @@ describe('MockActionsRegistry', () => { }); await expect( - registry.invoke({ id: 'testing:test', input: { name: 1 } }), - ).rejects.toThrow('Invalid output from action "testing:test"'); + registry.invoke({ id: 'test:my-demo-action', input: { name: 1 } }), + ).rejects.toThrow('Invalid output from action "test:my-demo-action"'); }); it('should list the actions correctly', async () => { const registry = mockServices.actionsRegistry(); registry.register({ - name: 'test', + name: 'my-demo-action', title: 'Test', description: 'Test', schema: { @@ -137,8 +137,8 @@ describe('MockActionsRegistry', () => { expect(result).toMatchObject({ actions: [ { - id: 'testing:test', - name: 'test', + id: 'test:my-demo-action', + name: 'my-demo-action', title: 'Test', description: 'Test', attributes: { diff --git a/packages/backend-test-utils/src/next/services/MockActionsRegistry.ts b/packages/backend-test-utils/src/next/services/MockActionsRegistry.ts index e3ceb0421f..62d940515b 100644 --- a/packages/backend-test-utils/src/next/services/MockActionsRegistry.ts +++ b/packages/backend-test-utils/src/next/services/MockActionsRegistry.ts @@ -151,8 +151,11 @@ export class MockActionsRegistry TInputSchema extends AnyZodObject, TOutputSchema extends AnyZodObject, >(options: ActionsRegistryActionOptions): void { - // hardcode testing: prefix similar to how the default actions registry does it - const id = `testing:${options.name}`; + // hardcode test: prefix similar to how the default actions registry does it + // and other places around the testing ecosystem: + // https://github.com/backstage/backstage/blob/a9219496d5c073aaa0b8caf32ece10455cf65e61/packages/backend-test-utils/src/next/services/mockServices.ts#L321 + // https://github.com/backstage/backstage/blob/861f162b4a39117b824669d67a951ed1db142e3d/packages/backend-test-utils/src/next/wiring/ServiceFactoryTester.ts#L99 + const id = `test:${options.name}`; if (this.actions.has(id)) { throw new Error(`Action with id "${id}" is already registered`);