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

This commit is contained in:
Piotr Pekala
2019-04-01 01:58:19 -07:00
54 changed files with 2322 additions and 19 deletions

View File

@ -41,6 +41,8 @@ import { MapLinkToLinkConverter } from '../../cartography/converters/map/map-lin
import { Link } from '../../models/link';
import { Project } from '../../models/project';
import { MovingEventSource } from '../../cartography/events/moving-event-source';
import { CapturingSettings } from '../../models/capturingSettings';
import { LinkWidget } from '../../cartography/widgets/link';
export class MockedProgressService {
public activate() {}
@ -113,8 +115,16 @@ export class MockedDrawingService {
export class MockedLinkService {
constructor() {}
getLink(server: Server, projectId: string, linkId: string) {
return of({});
}
deleteLink(_server: Server, link: Link){
return of({})
return of({});
}
updateLink(server: Server, link: Link) {
return of({});
}
createLink() {
@ -124,6 +134,14 @@ export class MockedLinkService {
updateNodes() {
return of({});
}
startCaptureOnLink(server: Server, link: Link, settings: CapturingSettings) {
return of({});
}
getAvailableFilters(server: Server, link: Link) {
return of({});
}
}
export class MockedDrawingsDataSource {
@ -146,7 +164,7 @@ export class MockedNodesDataSource {
clear() {}
get() {
return of({});
return {status: 'started'};
}
update() {
@ -180,6 +198,7 @@ describe('ProjectMapComponent', () => {
{ provide: ProjectWebServiceHandler },
{ provide: MapChangeDetectorRef },
{ provide: NodeWidget },
{ provide: LinkWidget },
{ provide: DrawingsWidget },
{ provide: MapNodeToNodeConverter },
{ provide: MapDrawingToDrawingConverter },