mirror of
https://github.com/GNS3/gns3-web-ui.git
synced 2025-06-01 15:00:49 +00:00
Fix for unit tests
This commit is contained in:
parent
ca7b43a5c2
commit
521b593212
@ -4,6 +4,7 @@ import { MatMenuModule } from '@angular/material/menu';
|
|||||||
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
||||||
import { MatToolbarModule } from '@angular/material/toolbar';
|
import { MatToolbarModule } from '@angular/material/toolbar';
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
|
import { ServerService } from '../../services/server.service';
|
||||||
import { ElectronService } from 'ngx-electron';
|
import { ElectronService } from 'ngx-electron';
|
||||||
import { Subject } from 'rxjs';
|
import { Subject } from 'rxjs';
|
||||||
import { ProgressComponent } from '../../common/progress/progress.component';
|
import { ProgressComponent } from '../../common/progress/progress.component';
|
||||||
@ -13,6 +14,9 @@ import { ServerManagementService, ServerStateEvent } from '../../services/server
|
|||||||
import { ToasterService } from '../../services/toaster.service';
|
import { ToasterService } from '../../services/toaster.service';
|
||||||
import { MockedToasterService } from '../../services/toaster.service.spec';
|
import { MockedToasterService } from '../../services/toaster.service.spec';
|
||||||
import { DefaultLayoutComponent } from './default-layout.component';
|
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 {
|
class ElectronServiceMock {
|
||||||
public isElectronApp: boolean;
|
public isElectronApp: boolean;
|
||||||
@ -28,6 +32,10 @@ describe('DefaultLayoutComponent', () => {
|
|||||||
let fixture: ComponentFixture<DefaultLayoutComponent>;
|
let fixture: ComponentFixture<DefaultLayoutComponent>;
|
||||||
let electronServiceMock: ElectronServiceMock;
|
let electronServiceMock: ElectronServiceMock;
|
||||||
let serverManagementService = new MockedServerManagementService();
|
let serverManagementService = new MockedServerManagementService();
|
||||||
|
let serverService: ServerService;
|
||||||
|
let indexedDbService: IndexedDbService;
|
||||||
|
let httpServer: HttpServer;
|
||||||
|
let errorHandler: ServerErrorHandler;
|
||||||
|
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
electronServiceMock = new ElectronServiceMock();
|
electronServiceMock = new ElectronServiceMock();
|
||||||
@ -35,7 +43,7 @@ describe('DefaultLayoutComponent', () => {
|
|||||||
|
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [DefaultLayoutComponent, ProgressComponent],
|
declarations: [DefaultLayoutComponent, ProgressComponent],
|
||||||
imports: [MatIconModule, MatMenuModule, MatToolbarModule, RouterTestingModule, MatProgressSpinnerModule],
|
imports: [MatIconModule, MatMenuModule, MatToolbarModule, HttpClientModule, RouterTestingModule, MatProgressSpinnerModule],
|
||||||
providers: [
|
providers: [
|
||||||
{
|
{
|
||||||
provide: ElectronService,
|
provide: ElectronService,
|
||||||
@ -53,9 +61,18 @@ describe('DefaultLayoutComponent', () => {
|
|||||||
provide: RecentlyOpenedProjectService,
|
provide: RecentlyOpenedProjectService,
|
||||||
useClass: RecentlyOpenedProjectService,
|
useClass: RecentlyOpenedProjectService,
|
||||||
},
|
},
|
||||||
|
{ provide: ServerService },
|
||||||
|
{ provide: IndexedDbService },
|
||||||
|
{ provide: HttpServer },
|
||||||
|
{ provide: ServerErrorHandler },
|
||||||
ProgressService,
|
ProgressService,
|
||||||
],
|
],
|
||||||
}).compileComponents();
|
}).compileComponents();
|
||||||
|
|
||||||
|
indexedDbService = TestBed.inject(IndexedDbService);
|
||||||
|
errorHandler = TestBed.inject(ServerErrorHandler);
|
||||||
|
httpServer = TestBed.inject(HttpServer);
|
||||||
|
serverService = TestBed.inject(ServerService);
|
||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
@ -37,7 +37,6 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
|
|||||||
private toasterService: ToasterService,
|
private toasterService: ToasterService,
|
||||||
private progressService: ProgressService,
|
private progressService: ProgressService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private route: ActivatedRoute,
|
|
||||||
private serverService: ServerService
|
private serverService: ServerService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
@ -49,19 +49,11 @@ describe('SymbolService', () => {
|
|||||||
expect(req.request.method).toEqual('GET');
|
expect(req.request.method).toEqual('GET');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should load symbols', inject([SymbolService], (service: SymbolService) => {
|
it('should call load symbols while adding symbol', inject([SymbolService], (service: SymbolService) => {
|
||||||
spyOn(service, 'load').and.returnValue(of([]));
|
spyOn(service, 'load');
|
||||||
|
|
||||||
service.list(server).subscribe();
|
service.add(server, 'symbolName', 'symbol');
|
||||||
|
|
||||||
expect(service.load).toHaveBeenCalled();
|
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');
|
|
||||||
}));
|
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user