From 8f4ba43b70caa1d02fb0aad8261dc67b25eedfcb Mon Sep 17 00:00:00 2001
From: Andrey Platov <andrey@hardcoreeng.com>
Date: Tue, 24 Aug 2021 15:03:47 +0200
Subject: [PATCH] fix platfrom tests
Signed-off-by: Andrey Platov <andrey@hardcoreeng.com>
---
packages/platform/src/__tests__/i18n.test.ts | 6 +++---
packages/platform/src/__tests__/ident.test.ts | 12 ++++++------
packages/platform/src/event.ts | 2 +-
packages/platform/src/lang/en.json | 4 +++-
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/packages/platform/src/__tests__/i18n.test.ts b/packages/platform/src/__tests__/i18n.test.ts
index be6b55a864..53211fe106 100644
--- a/packages/platform/src/__tests__/i18n.test.ts
+++ b/packages/platform/src/__tests__/i18n.test.ts
@@ -50,7 +50,7 @@ describe('i18n', () => {
it('should emit status and return id when no loader', async () => {
expect.assertions(2)
const plugin = 'plugin-without-string-loader'
- const message = `${plugin}.string.id`
+ const message = `${plugin}:string:id`
const checkStatus = new Status(Severity.ERROR, platform.status.NoLoaderForStrings, { plugin })
const eventListener = async (event: string, data: any): Promise<void> => {
@@ -65,7 +65,7 @@ describe('i18n', () => {
it('should emit status and return id when bad loader', async () => {
expect.assertions(2)
const plugin = 'component-for-bad-loader'
- const message = `${plugin}.string.id`
+ const message = `${plugin}:string:id`
const errorMessage = 'bad loader'
addStringsLoader(plugin as Plugin, (locale: string) => {
throw new Error(errorMessage)
@@ -83,7 +83,7 @@ describe('i18n', () => {
it('should cache error', async () => {
const plugin = 'component'
- const message = `${plugin}.string.id`
+ const message = `${plugin}:string:id`
const checkStatus = new Status(Severity.ERROR, platform.status.NoLoaderForStrings, { plugin })
let calls = 0
diff --git a/packages/platform/src/__tests__/ident.test.ts b/packages/platform/src/__tests__/ident.test.ts
index 174844325a..30b24c5268 100644
--- a/packages/platform/src/__tests__/ident.test.ts
+++ b/packages/platform/src/__tests__/ident.test.ts
@@ -26,7 +26,7 @@ describe('ident', () => {
MyString: '' as StatusCode<{}>
}
})
- expect(ids.status.MyString).toBe('test.status.MyString')
+ expect(ids.status.MyString).toBe('test:status:MyString')
})
it('should merge ids', () => {
@@ -43,9 +43,9 @@ describe('ident', () => {
X: '' as StatusCode<{}>
}
})
- expect(merged.resource.MyString).toBe('test.resource.MyString')
- expect(merged.resource.OneMore).toBe('test.resource.OneMore')
- expect(merged.more.X).toBe('test.more.X')
+ expect(merged.resource.MyString).toBe('test:resource:MyString')
+ expect(merged.resource.OneMore).toBe('test:resource:OneMore')
+ expect(merged.more.X).toBe('test:more:X')
})
it('should fail overwriting ids', () => {
@@ -65,12 +65,12 @@ describe('ident', () => {
it('should fail to parse id', () => {
expect(() => _parseId('bad id' as Id)).toThrowError(
- 'ERROR: platform.status.InvalidId'
+ 'ERROR: platform:status:InvalidId'
)
})
it('should parse id', () => {
- expect(_parseId('comp.res.X' as Id)).toEqual({
+ expect(_parseId('comp:res:X' as Id)).toEqual({
kind: 'res',
component: 'comp',
name: 'X'
diff --git a/packages/platform/src/event.ts b/packages/platform/src/event.ts
index 1408e015d0..babac9f96f 100644
--- a/packages/platform/src/event.ts
+++ b/packages/platform/src/event.ts
@@ -73,7 +73,7 @@ async function broadcastEvent (event: string, data: any): Promise<void> {
* @returns
*/
export async function setPlatformStatus (status: Status | Error): Promise<void> {
- console.log('platform status', status)
+ // console.log('platform status', status)
if (status instanceof Error) {
return await broadcastEvent(PlatformEvent, unknownError(status))
} else {
diff --git a/packages/platform/src/lang/en.json b/packages/platform/src/lang/en.json
index b8b1530a81..8114eb8e9d 100644
--- a/packages/platform/src/lang/en.json
+++ b/packages/platform/src/lang/en.json
@@ -1,5 +1,7 @@
{
"status": {
- "loadingPlugin": "Loading plugin '<b>'{plugin}'</b>'..."
+ "LoadingPlugin": "Loading plugin '<b>'{plugin}'</b>'...",
+ "UnknownError": "Unknown error: {message}",
+ "InvaldId": "Invalid Id: {id}"
}
}