Skip to content

Commit

Permalink
validation error message gives a hint about error source
Browse files Browse the repository at this point in the history
  • Loading branch information
mshustov committed Nov 12, 2019
1 parent 468dff7 commit 57f43cc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions src/core/server/config/config_service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ test('throws if config at path does not match schema', async () => {
await expect(
configService.setSchema('key', schema.string())
).rejects.toThrowErrorMatchingInlineSnapshot(
`"[key]: expected value of type [string] but got [number]"`
`"[config validation of [key]]: expected value of type [string] but got [number]"`
);
});

Expand All @@ -78,11 +78,11 @@ test('re-validate config when updated', async () => {
config$.next(new ObjectToConfigAdapter({ key: 123 }));

await expect(valuesReceived).toMatchInlineSnapshot(`
Array [
"value",
[Error: [key]: expected value of type [string] but got [number]],
]
`);
Array [
"value",
[Error: [config validation of [key]]: expected value of type [string] but got [number]],
]
`);
});

test("returns undefined if fetching optional config at a path that doesn't exist", async () => {
Expand Down Expand Up @@ -143,7 +143,7 @@ test("throws error if 'schema' is not defined for a key", async () => {
const configs = configService.atPath('key');

await expect(configs.pipe(first()).toPromise()).rejects.toMatchInlineSnapshot(
`[Error: No validation schema has been defined for key]`
`[Error: No validation schema has been defined for [key]]`
);
});

Expand All @@ -153,7 +153,7 @@ test("throws error if 'setSchema' called several times for the same key", async
const addSchema = async () => await configService.setSchema('key', schema.string());
await addSchema();
await expect(addSchema()).rejects.toMatchInlineSnapshot(
`[Error: Validation schema for key was already registered.]`
`[Error: Validation schema for [key] was already registered.]`
);
});

Expand Down
6 changes: 3 additions & 3 deletions src/core/server/config/config_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class ConfigService {
public async setSchema(path: ConfigPath, schema: Type<unknown>) {
const namespace = pathToString(path);
if (this.schemas.has(namespace)) {
throw new Error(`Validation schema for ${path} was already registered.`);
throw new Error(`Validation schema for [${path}] was already registered.`);
}

this.schemas.set(namespace, schema);
Expand Down Expand Up @@ -138,7 +138,7 @@ export class ConfigService {
const namespace = pathToString(path);
const schema = this.schemas.get(namespace);
if (!schema) {
throw new Error(`No validation schema has been defined for ${namespace}`);
throw new Error(`No validation schema has been defined for [${namespace}]`);
}
return schema.validate(
config,
Expand All @@ -147,7 +147,7 @@ export class ConfigService {
prod: this.env.mode.prod,
...this.env.packageInfo,
},
namespace
`config validation of [${namespace}]`
);
}

Expand Down

0 comments on commit 57f43cc

Please sign in to comment.