diff --git a/package.json b/package.json index 5028d50f7918be90a76987e8d7be58c74b5c746e..39ec4150376324c4716d6d4ad396926450ff4ea2 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@ngrx/effects": "^7.4.0", "@ngrx/store": "^7.4.0", "@ngtools/webpack": "^9.0.1", - "@types/jasmine": "^3.3.12", + "@types/jasmine": "^3.5.0", "@types/node": "^12.0.0", "@types/webpack-env": "^1.13.6", "@typescript-eslint/eslint-plugin": "^2.12.0", diff --git a/src/components/fabSpeedDial/fabSpeedDialContainer.directive.spec.ts b/src/components/fabSpeedDial/fabSpeedDialContainer.directive.spec.ts index 86a4a7d5dfe49a57859f749bc1029362f7f8f116..e370a18b7d28c1fb0843b8610accec1bc60808d4 100644 --- a/src/components/fabSpeedDial/fabSpeedDialContainer.directive.spec.ts +++ b/src/components/fabSpeedDial/fabSpeedDialContainer.directive.spec.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { TestBed } from "@angular/core/testing"; import { FabSpeedDialContainer } from "./fabSpeedDialContainer.directive"; -import { FabSpeedDialService } from "./fabSpeedDial.service"; +import { FabSpeedDialService, SCALE_ORIGIN } from "./fabSpeedDial.service"; import { BehaviorSubject } from "rxjs"; import { By } from "@angular/platform-browser"; @@ -94,7 +94,7 @@ describe('FabSpeedDialContainer', () => { const scaleOriginNextSpy = spyOn(dummyService.scaleOrigin$, 'next').and.callThrough() fixture.componentInstance.origin = 'right' fixture.detectChanges() - expect(scaleOriginNextSpy).toHaveBeenCalledWith('right') + expect(scaleOriginNextSpy).toHaveBeenCalledWith(SCALE_ORIGIN.RIGHT) }) it('on change, if invalid, expect next to not be called', () => { diff --git a/src/ui/databrowserModule/showDatasetDialog.directive.spec.ts b/src/ui/databrowserModule/showDatasetDialog.directive.spec.ts index 763bbbe2f097f1a2046ab9336d123208673aa416..18fa8349d210f0f86fdc82ecd8a2af4efaf57db4 100644 --- a/src/ui/databrowserModule/showDatasetDialog.directive.spec.ts +++ b/src/ui/databrowserModule/showDatasetDialog.directive.spec.ts @@ -109,7 +109,11 @@ describe('ShowDatasetDialogDirective', () => { directive.nativeElement.click() expect(snackbarOpenSpy).not.toHaveBeenCalled() - expect(dialogOpenSpy).toHaveBeenCalledWith(DummyDialogCmp, { + const mostRecentCall = dialogOpenSpy.calls.mostRecent() + const args = mostRecentCall.args as any[] + + expect(args[0]).toEqual(DummyDialogCmp) + expect(args[1]).toEqual({ ...ShowDatasetDialogDirective.defaultDialogConfig, data: { fullId: `minds/core/dataset/v1.0.0/aaa-bbb` @@ -142,7 +146,10 @@ describe('ShowDatasetDialogDirective', () => { directive.nativeElement.click() expect(snackbarOpenSpy).not.toHaveBeenCalled() - expect(dialogOpenSpy).toHaveBeenCalledWith(DummyDialogCmp, { + const mostRecentCall = dialogOpenSpy.calls.mostRecent() + const args = mostRecentCall.args as any[] + expect(args[0]).toEqual(DummyDialogCmp) + expect(args[1]).toEqual({ ...ShowDatasetDialogDirective.defaultDialogConfig, data: { fullId: `abc/ccc-ddd`