@@ -9,6 +9,7 @@ import { DockviewGroupPanelModel } from '../../../../dockview/dockviewGroupPanel
9
9
import { fireEvent } from '@testing-library/dom' ;
10
10
import { TestPanel } from '../../dockviewGroupPanelModel.spec' ;
11
11
import { IDockviewPanel } from '../../../../dockview/dockviewPanel' ;
12
+ import { fromPartial } from '@total-typescript/shoehorn' ;
12
13
13
14
describe ( 'tabsContainer' , ( ) => {
14
15
test ( 'that an external event does not render a drop target and calls through to the group mode' , ( ) => {
@@ -478,7 +479,7 @@ describe('tabsContainer', () => {
478
479
479
480
const groupPanelMock = jest . fn < DockviewGroupPanel , [ ] > ( ( ) => {
480
481
return ( < Partial < DockviewGroupPanel > > {
481
- api : { location : 'grid' } as any ,
482
+ api : { location : { type : 'grid' } } as any ,
482
483
} ) as DockviewGroupPanel ;
483
484
} ) ;
484
485
@@ -538,7 +539,7 @@ describe('tabsContainer', () => {
538
539
539
540
const groupPanelMock = jest . fn < DockviewGroupPanel , [ ] > ( ( ) => {
540
541
return ( < Partial < DockviewGroupPanel > > {
541
- api : { location : 'floating' } as any ,
542
+ api : { location : { type : 'floating' } } as any ,
542
543
} ) as DockviewGroupPanel ;
543
544
} ) ;
544
545
@@ -591,7 +592,7 @@ describe('tabsContainer', () => {
591
592
592
593
const groupPanelMock = jest . fn < DockviewGroupPanel , [ ] > ( ( ) => {
593
594
return ( < Partial < DockviewGroupPanel > > {
594
- api : { location : 'floating' } as any ,
595
+ api : { location : { type : 'floating' } } as any ,
595
596
model : { } as any ,
596
597
} ) as DockviewGroupPanel ;
597
598
} ) ;
@@ -601,23 +602,20 @@ describe('tabsContainer', () => {
601
602
602
603
const cut = new TabsContainer ( accessor , groupPanel ) ;
603
604
604
- const panelMock = jest . fn < IDockviewPanel , [ string ] > ( ( id : string ) => {
605
- const partial : Partial < IDockviewPanel > = {
605
+ const createPanel = ( id : string ) =>
606
+ fromPartial < IDockviewPanel > ( {
606
607
id,
607
-
608
608
view : {
609
609
tab : {
610
610
element : document . createElement ( 'div' ) ,
611
- } as any ,
611
+ } ,
612
612
content : {
613
613
element : document . createElement ( 'div' ) ,
614
- } as any ,
615
- } as any ,
616
- } ;
617
- return partial as IDockviewPanel ;
618
- } ) ;
614
+ } ,
615
+ } ,
616
+ } ) ;
619
617
620
- const panel = new panelMock ( 'test_id' ) ;
618
+ const panel = createPanel ( 'test_id' ) ;
621
619
cut . openPanel ( panel ) ;
622
620
623
621
const el = cut . element . querySelector ( '.tab' ) ! ;
@@ -628,15 +626,15 @@ describe('tabsContainer', () => {
628
626
fireEvent ( el , event ) ;
629
627
630
628
// a floating group with a single tab shouldn't be eligible
631
- expect ( preventDefaultSpy ) . toBeCalledTimes ( 0 ) ;
632
- expect ( accessor . addFloatingGroup ) . toBeCalledTimes ( 0 ) ;
629
+ expect ( preventDefaultSpy ) . toHaveBeenCalledTimes ( 0 ) ;
630
+ expect ( accessor . addFloatingGroup ) . toHaveBeenCalledTimes ( 0 ) ;
633
631
634
- const panel2 = new panelMock ( 'test_id_2' ) ;
632
+ const panel2 = createPanel ( 'test_id_2' ) ;
635
633
cut . openPanel ( panel2 ) ;
636
634
fireEvent ( el , event ) ;
637
635
638
- expect ( preventDefaultSpy ) . toBeCalledTimes ( 1 ) ;
639
- expect ( accessor . addFloatingGroup ) . toBeCalledTimes ( 1 ) ;
636
+ expect ( preventDefaultSpy ) . toHaveBeenCalledTimes ( 1 ) ;
637
+ expect ( accessor . addFloatingGroup ) . toHaveBeenCalledTimes ( 1 ) ;
640
638
} ) ;
641
639
642
640
test ( 'pre header actions' , ( ) => {
@@ -653,7 +651,7 @@ describe('tabsContainer', () => {
653
651
654
652
const groupPanelMock = jest . fn < DockviewGroupPanel , [ ] > ( ( ) => {
655
653
return ( < Partial < DockviewGroupPanel > > {
656
- api : { location : 'grid' } as any ,
654
+ api : { location : { type : 'grid' } } as any ,
657
655
model : { } as any ,
658
656
} ) as DockviewGroupPanel ;
659
657
} ) ;
@@ -723,7 +721,7 @@ describe('tabsContainer', () => {
723
721
724
722
const groupPanelMock = jest . fn < DockviewGroupPanel , [ ] > ( ( ) => {
725
723
return ( < Partial < DockviewGroupPanel > > {
726
- api : { location : 'grid' } as any ,
724
+ api : { location : { type : 'grid' } } as any ,
727
725
model : { } as any ,
728
726
} ) as DockviewGroupPanel ;
729
727
} ) ;
@@ -793,7 +791,7 @@ describe('tabsContainer', () => {
793
791
794
792
const groupPanelMock = jest . fn < DockviewGroupPanel , [ ] > ( ( ) => {
795
793
return ( < Partial < DockviewGroupPanel > > {
796
- api : { location : 'grid' } as any ,
794
+ api : { location : { type : 'grid' } } as any ,
797
795
model : { } as any ,
798
796
} ) as DockviewGroupPanel ;
799
797
} ) ;
0 commit comments