ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-21 07:58:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Rewrite-MovingTool-to-custom-solution

Browse Source
This commit is contained in:
Piotr Pekala
2019-06-10 01:37:01 -07:00
parent 83ac53e0a1 889c48be65
commit ee54d620ab
89 changed files with 1895 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/components/project-map/project-map.component.spec.ts
View File

@ -44,6 +44,7 @@ import { MovingEventSource } from '../../cartography/events/moving-event-source'
import { CapturingSettings } from '../../models/capturingSettings';
import { LinkWidget } from '../../cartography/widgets/link';
import { MapScaleService } from '../../services/mapScale.service';
import { NodeCreatedLabelStylesFixer } from './helpers/node-created-label-styles-fixer';
export class MockedProgressService {
public activate() {}
@ -184,8 +185,13 @@ describe('ProjectMapComponent', () => {
let drawingsDataSource = new MockedDrawingsDataSource();
let nodesDataSource = new MockedNodesDataSource();
let linksDataSource = new MockedLinksDataSource();
let nodeCreatedLabelStylesFixer;
beforeEach(async(() => {
nodeCreatedLabelStylesFixer = {
fix: (node) => node
};
TestBed.configureTestingModule({
imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule],
providers: [
@ -217,7 +223,8 @@ describe('ProjectMapComponent', () => {
provide: RecentlyOpenedProjectService,
useClass: RecentlyOpenedProjectService
},
{ provide: MapScaleService }
{ provide: MapScaleService },
{ provide: NodeCreatedLabelStylesFixer, useValue: nodeCreatedLabelStylesFixer}
],
declarations: [ProjectMapComponent, D3MapComponent, ...ANGULAR_MAP_DECLARATIONS],
schemas: [NO_ERRORS_SCHEMA]