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

Merge store into selection manager and separate selection listener

Browse Source
This commit is contained in:
ziajka
2018-11-14 16:24:12 +01:00
parent 71ae1f374f
commit c25e7f538d
18 changed files with 199 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { HttpClientTestingModule } from "@angular/common/http/testing";
import { inject } from "@angular/core/testing";
import { mock, instance, capture, when } from "ts-mockito";
import { mock, instance, capture, when, anything } from "ts-mockito";
import { HotkeyModule, HotkeysService, Hotkey } from "angular2-hotkeys";
import { of } from "rxjs";
@ -12,13 +12,17 @@ import { NodeService } from "../../../services/node.service";
import { HttpServer } from "../../../services/http-server.service";
import { SelectionManager } from "../../../cartography/managers/selection-manager";
import { Server } from "../../../models/server";
import { Node } from "../../../cartography/models/node";
import { Project } from "../../../models/project";
import { ProjectService } from "../../../services/project.service";
import { MockedProjectService } from "../../../services/project.service.spec";
import { SettingsService } from "../../../services/settings.service";
import { MockedToasterService } from "../../../services/toaster.service.spec";
import { mapTo } from "rxjs/internal/operators";
import { MapNodeToNodeConverter } from '../../../cartography/converters/map/map-node-to-node-converter';
import { MapNode } from '../../../cartography/models/map/map-node';
import { MapLabelToLabelConverter } from '../../../cartography/converters/map/map-label-to-label-converter';
import { MapPortToPortConverter } from '../../../cartography/converters/map/map-port-to-port-converter';
import { Node } from '../../../cartography/models/node';
describe('ProjectMapShortcutsComponent', () => {
@ -27,8 +31,13 @@ describe('ProjectMapShortcutsComponent', () => {
let hotkeyServiceMock: HotkeysService;
let hotkeyServiceInstanceMock: HotkeysService;
let nodeServiceMock: NodeService;
let node: MapNode;
beforeEach(async(() => {
node = new MapNode();
const selectionManagerMock = mock(SelectionManager);
when(selectionManagerMock.getSelected()).thenReturn([node]);
nodeServiceMock = mock(NodeService);
hotkeyServiceMock = mock(HotkeysService);
hotkeyServiceInstanceMock = instance(hotkeyServiceMock);
@ -43,7 +52,11 @@ describe('ProjectMapShortcutsComponent', () => {
{ provide: HotkeysService, useFactory: () => hotkeyServiceInstanceMock },
{ provide: ToasterService, useClass: MockedToasterService },
{ provide: ProjectService, useClass: MockedProjectService },
{ provide: SettingsService, useClass: SettingsService }
{ provide: SelectionManager, useValue: instance(selectionManagerMock)},
SettingsService,
MapNodeToNodeConverter,
MapLabelToLabelConverter,
MapPortToPortConverter
],
declarations: [ ProjectMapShortcutsComponent ]
})
@ -75,19 +88,14 @@ describe('ProjectMapShortcutsComponent', () => {
describe('onDeleteHandler', () => {
beforeEach(() => {
const selectionManagerMock = mock(SelectionManager);
const node = new Node();
node.node_id = "nodeid";
const server = new Server();
const project = new Project();
when(selectionManagerMock.getSelectedNodes()).thenReturn([node]);
when(nodeServiceMock.delete(server, node))
.thenReturn(of(node).pipe(mapTo(null)));
when(nodeServiceMock.delete(server, anything()))
.thenReturn(of(new Node()).pipe(mapTo(null)));
component.project = project;
component.server = server;
component.selectionManager = instance(selectionManagerMock);
});
it('should handle delete', inject([ToasterService], (toaster: MockedToasterService) => {