diff --git a/src/app/layouts/default-layout/default-layout.component.spec.ts b/src/app/layouts/default-layout/default-layout.component.spec.ts index 53816cf9..59f7e76f 100644 --- a/src/app/layouts/default-layout/default-layout.component.spec.ts +++ b/src/app/layouts/default-layout/default-layout.component.spec.ts @@ -4,6 +4,7 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatToolbarModule } from '@angular/material/toolbar'; import { RouterTestingModule } from '@angular/router/testing'; +import { ServerService } from '../../services/server.service'; import { ElectronService } from 'ngx-electron'; import { Subject } from 'rxjs'; import { ProgressComponent } from '../../common/progress/progress.component'; @@ -13,6 +14,9 @@ import { ServerManagementService, ServerStateEvent } from '../../services/server import { ToasterService } from '../../services/toaster.service'; import { MockedToasterService } from '../../services/toaster.service.spec'; import { DefaultLayoutComponent } from './default-layout.component'; +import { IndexedDbService } from '../../services/indexed-db.service'; +import { HttpServer, ServerErrorHandler } from '../../services/http-server.service'; +import { HttpClientModule } from '@angular/common/http'; class ElectronServiceMock { public isElectronApp: boolean; @@ -28,6 +32,10 @@ describe('DefaultLayoutComponent', () => { let fixture: ComponentFixture; let electronServiceMock: ElectronServiceMock; let serverManagementService = new MockedServerManagementService(); + let serverService: ServerService; + let indexedDbService: IndexedDbService; + let httpServer: HttpServer; + let errorHandler: ServerErrorHandler; beforeEach(async(() => { electronServiceMock = new ElectronServiceMock(); @@ -35,7 +43,7 @@ describe('DefaultLayoutComponent', () => { TestBed.configureTestingModule({ declarations: [DefaultLayoutComponent, ProgressComponent], - imports: [MatIconModule, MatMenuModule, MatToolbarModule, RouterTestingModule, MatProgressSpinnerModule], + imports: [MatIconModule, MatMenuModule, MatToolbarModule, HttpClientModule, RouterTestingModule, MatProgressSpinnerModule], providers: [ { provide: ElectronService, @@ -53,9 +61,18 @@ describe('DefaultLayoutComponent', () => { provide: RecentlyOpenedProjectService, useClass: RecentlyOpenedProjectService, }, + { provide: ServerService }, + { provide: IndexedDbService }, + { provide: HttpServer }, + { provide: ServerErrorHandler }, ProgressService, ], }).compileComponents(); + + indexedDbService = TestBed.inject(IndexedDbService); + errorHandler = TestBed.inject(ServerErrorHandler); + httpServer = TestBed.inject(HttpServer); + serverService = TestBed.inject(ServerService); })); beforeEach(() => { diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts index eb42edd5..0c2de64c 100644 --- a/src/app/layouts/default-layout/default-layout.component.ts +++ b/src/app/layouts/default-layout/default-layout.component.ts @@ -37,7 +37,6 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy { private toasterService: ToasterService, private progressService: ProgressService, private router: Router, - private route: ActivatedRoute, private serverService: ServerService ) {} diff --git a/src/app/services/symbol.service.spec.ts b/src/app/services/symbol.service.spec.ts index 2d8fdcf3..1c834000 100644 --- a/src/app/services/symbol.service.spec.ts +++ b/src/app/services/symbol.service.spec.ts @@ -49,19 +49,11 @@ describe('SymbolService', () => { expect(req.request.method).toEqual('GET'); })); - it('should load symbols', inject([SymbolService], (service: SymbolService) => { - spyOn(service, 'load').and.returnValue(of([])); + it('should call load symbols while adding symbol', inject([SymbolService], (service: SymbolService) => { + spyOn(service, 'load'); - service.list(server).subscribe(); + service.add(server, 'symbolName', 'symbol'); expect(service.load).toHaveBeenCalled(); })); - - it('should get symbols', inject([SymbolService], (service: SymbolService) => { - const symbol = new Symbol(); - symbol.symbol_id = 'myid'; - service.symbols.next([symbol]); - - expect(service.get('myid').symbol_id).toEqual('myid'); - })); });