Skip to content
This repository has been archived by the owner on Nov 22, 2019. It is now read-only.

Commit

Permalink
Fixes Jasmine unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mdrillin committed Oct 3, 2017
1 parent edb3b85 commit 2b49201
Show file tree
Hide file tree
Showing 17 changed files with 132 additions and 49 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';

import { ActivitiesCardsComponent } from './activities-cards.component';
import {ActivitiesCardsComponent} from './activities-cards.component';
import {RouterModule} from "@angular/router";

describe('ActivitiesCardsComponent', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';

import { ActivitiesListComponent } from './activities-list.component';
import {ActivitiesListComponent} from './activities-list.component';
import {RouterModule} from "@angular/router";

describe('ActivitiesListComponent', () => {
Expand Down
15 changes: 12 additions & 3 deletions ngapp/src/app/activities/activities.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';

import { ActivitiesComponent } from './activities.component';
import {ActivitiesComponent} from './activities.component';
import {FormsModule} from "@angular/forms";
import {RouterTestingModule} from "@angular/router/testing";
import {ActivitiesListComponent} from "@activities/activities-list/activities-list.component";
import {ActivitiesCardsComponent} from "@activities/activities-cards/activities-cards.component";
import {ModalModule} from "ngx-bootstrap";
import {HttpModule} from "@angular/http";
import {CoreModule} from "@core/core.module";
import {SharedModule} from "@shared/shared.module";

describe('ActivitiesComponent', () => {
let component: ActivitiesComponent;
let fixture: ComponentFixture<ActivitiesComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ActivitiesComponent ]
imports: [ CoreModule, FormsModule, HttpModule, ModalModule.forRoot(), RouterTestingModule, SharedModule ],
declarations: [ ActivitiesComponent, ActivitiesListComponent, ActivitiesCardsComponent ]
})
.compileComponents();
}));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';

import { AddActivityComponent } from './add-activity.component';
import {AddActivityComponent} from './add-activity.component';
import {FormsModule} from "@angular/forms";
import {RouterTestingModule} from "@angular/router/testing";
import {HttpModule} from '@angular/http';
import {BreadcrumbComponent} from '@core/breadcrumbs/breadcrumb/breadcrumb.component';
import {BreadcrumbsComponent} from '@core/breadcrumbs/breadcrumbs.component';
import {AddActivityFormComponent} from '@activities/shared/add-activity-form/add-activity-form.component';
import {ActivityService} from '@activities/shared/activity.service';
import {MockActivityService} from '@activities/shared/mock-activity.service';
import {CoreModule} from "@core/core.module";

describe('AddActivityComponent', () => {
let component: AddActivityComponent;
let fixture: ComponentFixture<AddActivityComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [ FormsModule, RouterTestingModule, HttpModule],
declarations: [ AddActivityComponent, AddActivityFormComponent, BreadcrumbComponent, BreadcrumbsComponent ],
imports: [ CoreModule, FormsModule, HttpModule, RouterTestingModule ],
declarations: [ AddActivityComponent, AddActivityFormComponent ],
providers: [
{ provide: ActivityService, useClass: MockActivityService },
]
Expand Down
2 changes: 2 additions & 0 deletions ngapp/src/app/activities/shared/activity.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { TestBed, inject } from '@angular/core/testing';
import { HttpModule } from "@angular/http";

import { ActivityService } from './activity.service';

describe('ActivityService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [ HttpModule ],
providers: [ActivityService]
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('AddActivityFormComponent', () => {

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [ FormsModule, RouterTestingModule, CoreModule ],
imports: [ CoreModule, FormsModule, RouterTestingModule ],
declarations: [ AddActivityFormComponent ]
})
.compileComponents();
Expand Down
15 changes: 3 additions & 12 deletions ngapp/src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { TestBed, async } from '@angular/core/testing';

import { AppComponent } from './app.component';
import { RouterTestingModule } from "@angular/router/testing";
import { CoreModule } from "@core/core.module";

describe('AppComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [ CoreModule, RouterTestingModule ],
declarations: [
AppComponent
],
Expand All @@ -17,16 +20,4 @@ describe('AppComponent', () => {
expect(app).toBeTruthy();
}));

it(`should have as title 'app'`, async(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app.title).toEqual('app');
}));

it('should render title in a h1 tag', async(() => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
}));
});
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';

import { AddConnectionComponent } from './add-connection.component';
import {AddConnectionComponent} from './add-connection.component';
import {AddConnectionFormComponent} from "@connections/add-connection/add-connection-form/add-connection-form.component";
import {FormsModule} from "@angular/forms";
import {ConnectionService} from "@connections/shared/connection.service";
import {MockConnectionService} from "@connections/shared/mock-connection.service";
import {HttpModule} from "@angular/http";
import {CoreModule} from "@core/core.module";

describe('AddConnectionComponent', () => {
let component: AddConnectionComponent;
let fixture: ComponentFixture<AddConnectionComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [ RouterTestingModule ],
declarations: [ AddConnectionComponent ]
imports: [ CoreModule, FormsModule, HttpModule, RouterTestingModule ],
declarations: [ AddConnectionComponent, AddConnectionFormComponent ],
providers: [
{ provide: ConnectionService, useClass: MockConnectionService },
]
})
.compileComponents();
}));
Expand Down
15 changes: 12 additions & 3 deletions ngapp/src/app/connections/connections.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';

import { ConnectionsComponent } from './connections.component';
import {ConnectionsComponent} from './connections.component';
import {FormsModule} from "@angular/forms";
import {RouterTestingModule} from "@angular/router/testing";
import {ConnectionsListComponent} from "@connections/connections-list/connections-list.component";
import {ConnectionsCardsComponent} from "@connections/connections-cards/connections-cards.component";
import {ModalModule} from "ngx-bootstrap";
import {HttpModule} from "@angular/http";
import {CoreModule} from "@core/core.module";
import {SharedModule} from "@shared/shared.module";

describe('ConnectionsComponent', () => {
let component: ConnectionsComponent;
let fixture: ComponentFixture<ConnectionsComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ConnectionsComponent ]
imports: [ CoreModule, FormsModule, HttpModule, ModalModule.forRoot(), RouterTestingModule, SharedModule ],
declarations: [ ConnectionsComponent, ConnectionsListComponent, ConnectionsCardsComponent ]
})
.compileComponents();
}));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';

import { EditConnectionComponent } from './edit-connection.component';
import {EditConnectionComponent} from './edit-connection.component';
import {RouterTestingModule} from '@angular/router/testing';
import {BreadcrumbsComponent} from '@core/breadcrumbs/breadcrumbs.component';
import {BreadcrumbComponent} from '@core/breadcrumbs/breadcrumb/breadcrumb.component';
import {ConnectionService} from "@connections/shared/connection.service";
import {MockConnectionService} from "@connections/shared/mock-connection.service";
import {HttpModule} from "@angular/http";
import {CoreModule} from "@core/core.module";

describe('EditConnectionComponent', () => {
let component: EditConnectionComponent;
let fixture: ComponentFixture<EditConnectionComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [ RouterTestingModule ],
declarations: [ EditConnectionComponent, BreadcrumbsComponent, BreadcrumbComponent ]
imports: [ CoreModule, HttpModule, RouterTestingModule ],
declarations: [ EditConnectionComponent ],
providers: [
{ provide: ConnectionService, useClass: MockConnectionService },
]
})
.compileComponents();
}));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';

import { FormsModule } from '@angular/forms';
import { AddConnectionFormComponent } from './add-connection-form.component';
import {FormsModule} from '@angular/forms';
import {AddConnectionFormComponent} from './add-connection-form.component';
import {RouterTestingModule} from '@angular/router/testing';

describe('AddConnectionFormComponent', () => {
Expand Down
6 changes: 4 additions & 2 deletions ngapp/src/app/connections/shared/connection.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { TestBed, inject } from '@angular/core/testing';
import {TestBed, inject} from '@angular/core/testing';

import { ConnectionService } from './connection.service';
import {ConnectionService} from './connection.service';
import {HttpModule} from "@angular/http";

describe('ConnectionService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [ HttpModule ],
providers: [ConnectionService]
});
});
Expand Down
52 changes: 52 additions & 0 deletions ngapp/src/app/connections/shared/mock-connection.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import {Injectable } from '@angular/core';
import {Http} from '@angular/http';
import {environment} from "@environments/environment";
import {Connection} from '@connections/shared/connection.model';
import {NewConnection} from '@connections/shared/new-connection.model';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/operator/map';
import 'rxjs/add/operator/catch';
import 'rxjs/add/observable/throw';
import 'rxjs/add/observable/of';

const KOMODO_WORKSPACE_URL = environment.komodoWorkspaceUrl;

@Injectable()
export class MockConnectionService {

newConnection = new NewConnection();
conn1 = new Connection();
conn2 = new Connection();
conn3 = new Connection();
conns: Connection[] = [this.conn1, this.conn2, this.conn3];

constructor( private http: Http ) {
}

/**
* Get the connections from the komodo rest interface
* @returns {Observable<Connection[]>}
*/
public getAllConnections(): Observable<Connection[]> {
return Observable.of(this.conns);
}

/**
* Create a connection via the komodo rest interface
* @param {NewConnection} connection
* @returns {Observable<Connection>}
*/
public createConnection(connection: NewConnection): Observable<NewConnection> {
return Observable.of(this.newConnection);
}

/**
* Delete a connection via the komodo rest interface
* @param {NewConnection} connection
* @returns {Observable<Connection>}
*/
public deleteConnection(connection: NewConnection): Observable<NewConnection> {
return Observable.of(this.newConnection);
}

}
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';

import { BreadcrumbComponent } from './breadcrumb.component';
import {BreadcrumbComponent} from './breadcrumb.component';
import {RouterTestingModule} from "@angular/router/testing";

describe('BreadcrumbComponent', () => {
let component: BreadcrumbComponent;
let fixture: ComponentFixture<BreadcrumbComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [ RouterTestingModule ],
declarations: [ BreadcrumbComponent ]
})
.compileComponents();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { ConfirmDeleteComponent } from './confirm-delete.component';
import {ModalModule} from 'ngx-bootstrap';
import { ModalModule } from 'ngx-bootstrap';

describe('ConfirmDeleteComponent', () => {
let component: ConfirmDeleteComponent;
Expand Down
3 changes: 3 additions & 0 deletions ngapp/src/app/shared/page-error/page-error.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { PageErrorComponent } from './page-error.component';
import { HttpModule } from "@angular/http";

describe('PageErrorComponent', () => {
let component: PageErrorComponent;
let fixture: ComponentFixture<PageErrorComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [ HttpModule ],
declarations: [ PageErrorComponent ]
})
.compileComponents();
Expand All @@ -16,6 +18,7 @@ describe('PageErrorComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(PageErrorComponent);
component = fixture.componentInstance;
component.error = 'test';
fixture.detectChanges();
});

Expand Down
2 changes: 1 addition & 1 deletion ngapp/src/app/shared/shared.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { ModalModule } from 'ngx-bootstrap';
@NgModule({
imports: [
CommonModule,
ModalModule
ModalModule.forRoot()
],
declarations: [
ConfirmDeleteComponent,
Expand Down

0 comments on commit 2b49201

Please sign in to comment.