From a17dd7478745242c4ad87b2b163e85e77793e1e4 Mon Sep 17 00:00:00 2001 From: Xiao Gui <xgui3783@gmail.com> Date: Mon, 15 Feb 2021 11:21:23 +0100 Subject: [PATCH] fix lint & test --- spec/test.ts | 12 +++++------- .../parcellationRegion/region.base.spec.ts | 2 +- .../parcellationRegion/region.base.ts | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/spec/test.ts b/spec/test.ts index 7e0ab9cc3..478be25bb 100644 --- a/spec/test.ts +++ b/spec/test.ts @@ -18,12 +18,10 @@ getTestBed().initTestEnvironment( platformBrowserDynamicTesting() ); -// const testContext = require.context('../src', true, /\.spec\.ts$/) -// testContext.keys().map(testContext) +const testContext = require.context('../src', true, /\.spec\.ts$/) +testContext.keys().map(testContext) -// const workerCtx = require.context('../worker', true, /\.spec\.js$/) -// workerCtx.keys().map(workerCtx) +const workerCtx = require.context('../worker', true, /\.spec\.js$/) +workerCtx.keys().map(workerCtx) -// require('../common/util.spec.js') - -require('../src/atlasComponents/parcellationRegion/region.base.spec') \ No newline at end of file +require('../common/util.spec.js') diff --git a/src/atlasComponents/parcellationRegion/region.base.spec.ts b/src/atlasComponents/parcellationRegion/region.base.spec.ts index 88a2ca8e3..93899584d 100644 --- a/src/atlasComponents/parcellationRegion/region.base.spec.ts +++ b/src/atlasComponents/parcellationRegion/region.base.spec.ts @@ -447,7 +447,7 @@ describe('> region.base.ts', () => { beforeEach(() => { TestBed.configureTestingModule({ providers: [ - provideMockStore({ initialState: {} }) + provideMockStore() ] }) }) diff --git a/src/atlasComponents/parcellationRegion/region.base.ts b/src/atlasComponents/parcellationRegion/region.base.ts index b1d159e64..68b83999a 100644 --- a/src/atlasComponents/parcellationRegion/region.base.ts +++ b/src/atlasComponents/parcellationRegion/region.base.ts @@ -36,7 +36,7 @@ export class RegionBase { this.position = val && val.position if (!this._region) return - let rgb = this._region.rgb + const rgb = this._region.rgb || (this._region.labelIndex > 65500 && [255, 255, 255]) || strToRgb(`${this._region.ngId || this._region.name}${this._region.labelIndex}`) || [255, 200, 200] -- GitLab