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

Ability to delete project added

Browse Source
This commit is contained in:
Piotr Pekala
2019-02-21 04:03:14 -08:00
parent 5b621e9468
commit fb1a64fe5d
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/components/projects/projects.component.html
View File

@ -43,9 +43,9 @@
<button mat-icon-button matTooltip="Close project" (click)="close(row)" *ngIf="row.status == 'opened'"> <button mat-icon-button matTooltip="Close project" (click)="close(row)" *ngIf="row.status == 'opened'">
<mat-icon aria-label="Close project">pause</mat-icon> <mat-icon aria-label="Close project">pause</mat-icon>
</button> </button>
<!--<button mat-icon-button matTooltip="Delete project" (click)="delete(row)" *ngIf="settings.experimental_features">--> <button mat-icon-button matTooltip="Delete project" (click)="delete(row)" *ngIf="row.status == 'closed'">
<!--<mat-icon aria-label="Delete project">delete</mat-icon>--> <mat-icon aria-label="Open project">delete</mat-icon>
<!--</button>--> </button>
</mat-cell> </mat-cell>
</ng-container> </ng-container>

13
src/app/components/projects/projects.component.spec.ts
View File

@ -25,6 +25,7 @@ describe('ProjectsComponent', () => {
let serverService: ServerService; let serverService: ServerService;
let server: Server; let server: Server;
let progressService: ProgressService; let progressService: ProgressService;
let mockedProjectService: MockedProjectService = new MockedProjectService();
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
@ -39,7 +40,7 @@ describe('ProjectsComponent', () => {
], ],
providers: [ providers: [
{ provide: ServerService, useClass: MockedServerService }, { provide: ServerService, useClass: MockedServerService },
{ provide: ProjectService, useClass: MockedProjectService }, { provide: ProjectService, useValue: mockedProjectService },
{ provide: SettingsService, useClass: MockedSettingsService }, { provide: SettingsService, useClass: MockedSettingsService },
ProgressService ProgressService
], ],
@ -74,6 +75,16 @@ describe('ProjectsComponent', () => {
expect(component).toBeTruthy(); expect(component).toBeTruthy();
}); });
it('should remove item after delete action', () => {
spyOn(mockedProjectService, 'delete').and.returnValue(of());
let project = new Project();
project.project_id = '1';
component.delete(project);
expect(mockedProjectService.delete).toHaveBeenCalled();
});
describe('ProjectComponent open', () => { describe('ProjectComponent open', () => {
let project: Project; let project: Project;

6
src/app/services/project.service.spec.ts
View File

@ -8,9 +8,9 @@ import { getTestServer } from './testing';
import { ProjectService } from './project.service'; import { ProjectService } from './project.service';
import { SettingsService } from './settings.service'; import { SettingsService } from './settings.service';
import { MockedSettingsService } from './settings.service.spec'; import { MockedSettingsService } from './settings.service.spec';
import { Observable, of } from 'rxjs';
import { Project } from '../models/project'; import { Project } from '../models/project';
import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { AppTestingModule } from '../testing/app-testing/app-testing.module';
import { of } from 'rxjs';
/** /**
* Mocks ProjectsService so it's not based on settings * Mocks ProjectsService so it's not based on settings
@ -37,6 +37,10 @@ export class MockedProjectService {
links(server: Server, project_id: string) { links(server: Server, project_id: string) {
return of([]); return of([]);
} }
delete(server: Server, project_id: string) {
return of(project_id);
}
} }
describe('ProjectService', () => { describe('ProjectService', () => {