ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-20 23:55:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes after review

Browse Source
This commit is contained in:
PiotrP
2018-11-13 15:10:24 -08:00
parent 0e35d1c7f6
commit 618f966361
6 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts
View File

@ -1,11 +1,9 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AddBlankProjectDialogComponent } from "./add-blank-project-dialog.component";
import { Server } from "../../../models/server";
import { FormBuilder, ReactiveFormsModule, FormsModule, Validators, FormControl } from '@angular/forms';
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { MatDialogModule, MatInputModule, MatFormFieldModule, MatDialogRef, MAT_DIALOG_DATA, MatSnackBarModule } from '@angular/material';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { DebugElement } from '@angular/core';
import { Validator } from '../models/validator';
import { ProjectService } from '../../../services/project.service';
import { ToasterService } from '../../../services/toaster.service';
import { of } from 'rxjs/internal/observable/of';
@ -30,11 +28,11 @@ export class MockedProjectService {
snap_to_grid: false,
}];
list(server: Server) {
list() {
return of(this.projects);
}
add(server: Server, projectname: string, uuid: string){
add(){
return of(this.projects.pop);
}
}
@ -43,7 +41,6 @@ describe('AddBlankProjectDialogComponent', () => {
let component: AddBlankProjectDialogComponent;
let fixture: ComponentFixture<AddBlankProjectDialogComponent>;
let server: Server;
let formBuilder: FormBuilder;
beforeEach(async(() => {
TestBed.configureTestingModule({
@ -69,16 +66,12 @@ describe('AddBlankProjectDialogComponent', () => {
server = new Server();
server.ip = "localhost";
server.port = 80;
formBuilder = new FormBuilder();
}));
beforeEach(() => {
fixture = TestBed.createComponent(AddBlankProjectDialogComponent);
component = fixture.componentInstance;
component.server = server;
component.projectNameForm = formBuilder.group({
projectName: new FormControl(null, [Validators.required, Validator.projectNameValidator])
});
component.projectNameForm.controls['projectName'].setValue("ValidName");
fixture.detectChanges();
})

10
src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts
View File

@ -6,13 +6,14 @@ import { Server } from '../../../models/server';
import { ProjectService } from '../../../services/project.service';
import { v4 as uuid } from 'uuid';
import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component';
import { Validator } from '../models/validator';
import { ProjectNameValidator } from '../models/projectNameValidator';
import { ToasterService } from '../../../services/toaster.service';
@Component({
selector: 'app-add-blank-project-dialog',
templateUrl: './add-blank-project-dialog.component.html',
styleUrls: ['./add-blank-project-dialog.component.css']
styleUrls: ['./add-blank-project-dialog.component.css'],
providers: [ProjectNameValidator]
})
export class AddBlankProjectDialogComponent implements OnInit {
server: Server;
@ -23,9 +24,10 @@ export class AddBlankProjectDialogComponent implements OnInit {
private dialog: MatDialog,
private projectService: ProjectService,
private toasterService: ToasterService,
private formBuilder: FormBuilder) {
private formBuilder: FormBuilder,
private projectNameValidator: ProjectNameValidator) {
this.projectNameForm = this.formBuilder.group({
projectName: new FormControl(null, [Validators.required, Validator.projectNameValidator])
projectName: new FormControl(null, [Validators.required, projectNameValidator.get])
});
}