ssube
/
salty-dog
1
0
Fork 0
Code

fix: update log level to use enum

This commit is contained in:
ssube 2019-11-10 21:52:56 -06:00 committed by Sean Sube
parent 0af369cc61
commit 13d42e8b6f
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rule/SchemaRule.ts
View File

@ -79,7 +79,7 @@ export function friendlyError(ctx: VisitorContext, err: ErrorObject): VisitorErr
data: { data: {
err, err,
}, },
level: 'error', level: LogLevel.Error,
msg: friendlyErrorMessage(ctx, err), msg: friendlyErrorMessage(ctx, err),
}; };
} }

22
test/rule/TestRule.ts
View File

@ -1,5 +1,5 @@
import { expect } from 'chai'; import { expect } from 'chai';
import { ConsoleLogger } from 'noicejs'; import { ConsoleLogger, LogLevel } from 'noicejs';
import { mock, spy, stub } from 'sinon'; import { mock, spy, stub } from 'sinon';
import { createRuleSelector, createRuleSources, resolveRules, visitRules } from '../../src/rule'; import { createRuleSelector, createRuleSources, resolveRules, visitRules } from '../../src/rule';
@ -10,21 +10,21 @@ import { describeLeaks, itLeaks } from '../helpers/async';
const TEST_RULES = [new SchemaRule({ const TEST_RULES = [new SchemaRule({
check: {}, check: {},
desc: '', desc: '',
level: 'info', level: LogLevel.Info,
name: 'foo', name: 'foo',
select: '$', select: '$',
tags: ['all', 'foo'], tags: ['all', 'foo'],
}), new SchemaRule({ }), new SchemaRule({
check: {}, check: {},
desc: '', desc: '',
level: 'warn', level: LogLevel.Warn,
name: 'bar', name: 'bar',
select: '$', select: '$',
tags: ['all', 'test'], tags: ['all', 'test'],
}), new SchemaRule({ }), new SchemaRule({
check: {}, check: {},
desc: '', desc: '',
level: 'warn', level: LogLevel.Warn,
name: 'bin', name: 'bin',
select: '$', select: '$',
tags: ['all', 'test'], tags: ['all', 'test'],
@ -34,7 +34,7 @@ describeLeaks('rule resolver', async () => {
describeLeaks('include by level', async () => { describeLeaks('include by level', async () => {
itLeaks('should include info rules', async () => { itLeaks('should include info rules', async () => {
const info = await resolveRules(TEST_RULES, createRuleSelector({ const info = await resolveRules(TEST_RULES, createRuleSelector({
includeLevel: ['info'], includeLevel: [LogLevel.Info],
})); }));
expect(info.length).to.equal(1); expect(info.length).to.equal(1);
@ -43,7 +43,7 @@ describeLeaks('rule resolver', async () => {
itLeaks('should include warn rules', async () => { itLeaks('should include warn rules', async () => {
const info = await resolveRules(TEST_RULES, createRuleSelector({ const info = await resolveRules(TEST_RULES, createRuleSelector({
includeLevel: ['warn'], includeLevel: [LogLevel.Warn],
})); }));
expect(info.length).to.equal(2); expect(info.length).to.equal(2);
@ -115,7 +115,7 @@ describeLeaks('rule visitor', async () => {
const rule = new SchemaRule({ const rule = new SchemaRule({
check: {}, check: {},
desc: '', desc: '',
level: 'info', level: LogLevel.Info,
name: 'foo', name: 'foo',
select: '$', select: '$',
tags: [], tags: [],
@ -147,7 +147,7 @@ describeLeaks('rule visitor', async () => {
const rule = new SchemaRule({ const rule = new SchemaRule({
check: {}, check: {},
desc: '', desc: '',
level: 'info', level: LogLevel.Info,
name: 'foo', name: 'foo',
select: '$', select: '$',
tags: [], tags: [],
@ -184,7 +184,7 @@ describeLeaks('rule visitor', async () => {
const rule = new SchemaRule({ const rule = new SchemaRule({
check: {}, check: {},
desc: '', desc: '',
level: 'info', level: LogLevel.Info,
name: 'foo', name: 'foo',
select: '$.foo.*', select: '$.foo.*',
tags: [], tags: [],
@ -217,7 +217,7 @@ describeLeaks('rule visitor', async () => {
const rule = new SchemaRule({ const rule = new SchemaRule({
check: {}, check: {},
desc: '', desc: '',
level: 'info', level: LogLevel.Info,
name: 'foo', name: 'foo',
select: '$.foo.*', select: '$.foo.*',
tags: [], tags: [],
@ -227,7 +227,7 @@ describeLeaks('rule visitor', async () => {
changes: [], changes: [],
errors: [{ errors: [{
data: {}, data: {},
level: 'error', level: LogLevel.Error,
msg: 'kaboom!', msg: 'kaboom!',
}], }],
})); }));

16
test/rule/TestSchemaRule.ts
View File

@ -1,5 +1,5 @@
import { expect } from 'chai'; import { expect } from 'chai';
import { NullLogger } from 'noicejs'; import { LogLevel, NullLogger } from 'noicejs';
import { stub } from 'sinon'; import { stub } from 'sinon';
import { friendlyError, SchemaRule } from '../../src/rule/SchemaRule'; import { friendlyError, SchemaRule } from '../../src/rule/SchemaRule';
@ -26,7 +26,7 @@ describeLeaks('schema rule', async () => {
const rule = new SchemaRule({ const rule = new SchemaRule({
check: {}, check: {},
desc: '', desc: '',
level: 'info', level: LogLevel.Info,
name: 'foo', name: 'foo',
select: '$.foo', select: '$.foo',
tags: [], tags: [],
@ -60,7 +60,7 @@ describeLeaks('schema rule', async () => {
}, },
type: 'object', type: 'object',
}, },
level: 'info', level: LogLevel.Info,
name: 'foo', name: 'foo',
select: '$.foo', select: '$.foo',
tags: [], tags: [],
@ -82,7 +82,7 @@ describeLeaks('schema rule', async () => {
const rule = new SchemaRule({ const rule = new SchemaRule({
check: undefined, check: undefined,
desc: TEST_NAME, desc: TEST_NAME,
level: 'info', level: LogLevel.Info,
name: TEST_NAME, name: TEST_NAME,
select: '$.foo', select: '$.foo',
tags: [], tags: [],
@ -113,7 +113,7 @@ describeLeaks('schema rule', async () => {
check, check,
desc: TEST_NAME, desc: TEST_NAME,
filter, filter,
level: 'info', level: LogLevel.Info,
name: TEST_NAME, name: TEST_NAME,
select: '$.foo', select: '$.foo',
tags: [], tags: [],
@ -144,7 +144,7 @@ describeLeaks('schema rule', async () => {
check: undefined, check: undefined,
desc: TEST_NAME, desc: TEST_NAME,
filter: {}, filter: {},
level: 'info', level: LogLevel.Info,
name: TEST_NAME, name: TEST_NAME,
select: '$.foo', select: '$.foo',
tags: [], tags: [],
@ -163,7 +163,7 @@ describe('friendly errors', () => {
const rule = new SchemaRule({ const rule = new SchemaRule({
check: {}, check: {},
desc: TEST_NAME, desc: TEST_NAME,
level: 'info', level: LogLevel.Info,
name: TEST_NAME, name: TEST_NAME,
select: '', select: '',
tags: [TEST_NAME], tags: [TEST_NAME],
@ -194,7 +194,7 @@ describe('friendly errors', () => {
const rule = new SchemaRule({ const rule = new SchemaRule({
check: {}, check: {},
desc: TEST_NAME, desc: TEST_NAME,
level: 'info', level: LogLevel.Info,
name: TEST_NAME, name: TEST_NAME,
select: '', select: '',
tags: [TEST_NAME], tags: [TEST_NAME],

4
test/visitor/TestContext.ts
View File

@ -1,5 +1,5 @@
import { expect } from 'chai'; import { expect } from 'chai';
import { ConsoleLogger } from 'noicejs'; import { ConsoleLogger, LogLevel } from 'noicejs';
import { VisitorContext } from '../../src/visitor/VisitorContext'; import { VisitorContext } from '../../src/visitor/VisitorContext';
@ -23,7 +23,7 @@ describe('visitor context', () => {
data: { data: {
foo: 2, foo: 2,
}, },
level: 'info', level: LogLevel.Info,
msg: 'uh oh', msg: 'uh oh',
}], }],
}); });