From 570352ce5147648fae33a3ca7aef3e11348a19a3 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Mon, 7 Mar 2022 16:27:34 +0100
Subject: [PATCH] fix tests, lint & package-lock
---
package-lock.json | 2 +-
.../nehuba/layerCtrl.service/layerCtrl.service.spec.ts | 10 +++++++++-
.../nehubaViewerGlue.component.spec.ts | 6 ++++++
src/viewerModule/viewerCmp/viewerCmp.component.ts | 6 +-----
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 24ee84409..fbe1d0c51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "interactive-viewer",
- "version": "2.6.5",
+ "version": "2.6.6",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.spec.ts b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.spec.ts
index 7e41087b1..45bbe3379 100644
--- a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.spec.ts
+++ b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.spec.ts
@@ -7,6 +7,8 @@ import { hot } from "jasmine-marbles"
import { IColorMap } from "./layerCtrl.util"
import { debounceTime } from "rxjs/operators"
import { ngViewerSelectorClearView, ngViewerSelectorLayers } from "src/services/state/ngViewerState.store.helper"
+import { RouterService } from "src/routerModule/router.service"
+import { NEVER } from "rxjs"
describe('> layerctrl.service.ts', () => {
describe('> NehubaLayerControlService', () => {
@@ -16,8 +18,14 @@ describe('> layerctrl.service.ts', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [
+ {
+ provide: RouterService,
+ useValue: {
+ customRoute$: NEVER
+ }
+ },
NehubaLayerControlService,
- provideMockStore()
+ provideMockStore(),
]
})
diff --git a/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.spec.ts b/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.spec.ts
index 8aa04373c..a73f96b59 100644
--- a/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.spec.ts
+++ b/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.spec.ts
@@ -26,6 +26,7 @@ import { TouchSideClass } from "../touchSideClass.directive"
import { NehubaGlueCmp } from "./nehubaViewerGlue.component"
import { HarnessLoader } from "@angular/cdk/testing"
import { AtlasWorkerService } from "src/atlasViewer/atlasViewer.workerService.service"
+import { RouterService } from "src/routerModule/router.service"
@Component({
@@ -110,6 +111,11 @@ describe('> nehubaViewerGlue.component.ts', () => {
segmentVis$: new Subject(),
ngLayersController$: new Subject(),
}
+ },{
+ provide: RouterService,
+ useValue: {
+ customRoute$: NEVER
+ }
}, {
provide: NehubaMeshService,
useValue: {
diff --git a/src/viewerModule/viewerCmp/viewerCmp.component.ts b/src/viewerModule/viewerCmp/viewerCmp.component.ts
index b1b8c3235..bef5dc230 100644
--- a/src/viewerModule/viewerCmp/viewerCmp.component.ts
+++ b/src/viewerModule/viewerCmp/viewerCmp.component.ts
@@ -208,11 +208,7 @@ export class ViewerCmp implements OnDestroy {
) || NEVER,
this._1umVoi$.pipe(
map(flag => flag
- ? ({
- title: this._1umTitle,
- description: this._1umDesc,
- url: [{ doi: this._1umLink }]
- })
+ ? ({ title: this._1umTitle, description: this._1umDesc, url: [{ doi: this._1umLink }] })
: null
)
)
--
GitLab