Apply code style

This commit is contained in:
ziajka
2019-01-15 11:15:54 +01:00
parent fd8fbf3919
commit 74b84a13f0
357 changed files with 5859 additions and 6469 deletions

View File

@ -1,23 +1,23 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { HttpClientTestingModule } from "@angular/common/http/testing";
import { inject } from "@angular/core/testing";
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { inject } from '@angular/core/testing';
import { mock, instance, capture, when, anything } from "ts-mockito";
import { HotkeyModule, HotkeysService, Hotkey } from "angular2-hotkeys";
import { of } from "rxjs";
import { mock, instance, capture, when, anything } from 'ts-mockito';
import { HotkeyModule, HotkeysService, Hotkey } from 'angular2-hotkeys';
import { of } from 'rxjs';
import { ProjectMapShortcutsComponent } from './project-map-shortcuts.component';
import { ToasterService, } from "../../../services/toaster.service";
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 { 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 { ToasterService } from '../../../services/toaster.service';
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 { 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';
@ -27,7 +27,6 @@ import { FontBBoxCalculator } from '../../../cartography/helpers/font-bbox-calcu
import { CssFixer } from '../../../cartography/helpers/css-fixer';
import { FontFixer } from '../../../cartography/helpers/font-fixer';
describe('ProjectMapShortcutsComponent', () => {
let component: ProjectMapShortcutsComponent;
let fixture: ComponentFixture<ProjectMapShortcutsComponent>;
@ -45,17 +44,14 @@ describe('ProjectMapShortcutsComponent', () => {
hotkeyServiceMock = mock(HotkeysService);
hotkeyServiceInstanceMock = instance(hotkeyServiceMock);
TestBed.configureTestingModule({
imports: [
HotkeyModule.forRoot(),
HttpClientTestingModule
],
imports: [HotkeyModule.forRoot(), HttpClientTestingModule],
providers: [
HttpServer,
{ provide: NodeService, useFactory: () => instance(nodeServiceMock) },
{ provide: HotkeysService, useFactory: () => hotkeyServiceInstanceMock },
{ provide: ToasterService, useClass: MockedToasterService },
{ provide: ProjectService, useClass: MockedProjectService },
{ provide: SelectionManager, useValue: instance(selectionManagerMock)},
{ provide: SelectionManager, useValue: instance(selectionManagerMock) },
SettingsService,
MapNodeToNodeConverter,
MapLabelToLabelConverter,
@ -65,9 +61,8 @@ describe('ProjectMapShortcutsComponent', () => {
CssFixer,
FontFixer
],
declarations: [ ProjectMapShortcutsComponent ]
})
.compileComponents();
declarations: [ProjectMapShortcutsComponent]
}).compileComponents();
}));
beforeEach(() => {
@ -83,14 +78,14 @@ describe('ProjectMapShortcutsComponent', () => {
it('should bind delete key', () => {
component.ngOnInit();
const [hotkey] = capture(hotkeyServiceMock.add).last();
expect((hotkey as Hotkey).combo).toEqual([ 'del' ]);
expect((hotkey as Hotkey).combo).toEqual(['del']);
expect((hotkey as Hotkey).callback).toBeDefined();
});
it('should remove binding', () => {
component.ngOnDestroy();
const [hotkey] = capture(hotkeyServiceMock.remove).last();
expect((hotkey as Hotkey).combo).toEqual([ 'del' ]);
expect((hotkey as Hotkey).combo).toEqual(['del']);
});
describe('onDeleteHandler', () => {
@ -98,8 +93,7 @@ describe('ProjectMapShortcutsComponent', () => {
const server = new Server();
const project = new Project();
when(nodeServiceMock.delete(server, anything()))
.thenReturn(of(new Node()).pipe(mapTo(null)));
when(nodeServiceMock.delete(server, anything())).thenReturn(of(new Node()).pipe(mapTo(null)));
component.project = project;
component.server = server;
@ -108,7 +102,7 @@ describe('ProjectMapShortcutsComponent', () => {
it('should handle delete', inject([ToasterService], (toaster: MockedToasterService) => {
component.project.readonly = false;
component.onDeleteHandler(null);
expect(toaster.successes).toEqual(["Node has been deleted"]);
expect(toaster.successes).toEqual(['Node has been deleted']);
}));
it('should not delete when project in readonly mode', inject([ToasterService], (toaster: MockedToasterService) => {
@ -117,5 +111,4 @@ describe('ProjectMapShortcutsComponent', () => {
expect(toaster.successes).toEqual([]);
}));
});
});