From 1cc8e6b24090d85e60ae76b38dc641648fed46e5 Mon Sep 17 00:00:00 2001 From: Ted Jones Date: Mon, 12 Mar 2018 09:12:09 -0500 Subject: [PATCH] Fix for build error and test case. --- .../about-dialog.component.spec.ts | 18 +++++++++++++++--- .../about-dialog/about-dialog.component.ts | 10 ++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ngapp/src/app/core/about-dialog/about-dialog.component.spec.ts b/ngapp/src/app/core/about-dialog/about-dialog.component.spec.ts index 6515eaee..a65ddf9b 100644 --- a/ngapp/src/app/core/about-dialog/about-dialog.component.spec.ts +++ b/ngapp/src/app/core/about-dialog/about-dialog.component.spec.ts @@ -1,7 +1,12 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; - +import { HttpModule } from "@angular/http"; import { About } from "@core/about-dialog/about.model"; +import { AboutService } from "@core/about-dialog/about.service"; import { MockAboutService } from "@core/about-dialog/mock-about.service"; +import { AppSettingsService } from "@core/app-settings.service"; +import { LoggerService } from "@core/logger.service"; +import { MockAppSettingsService } from "@core/mock-app-settings.service"; +import { PatternFlyNgModule } from "patternfly-ng"; import { AboutDialogComponent } from "./about-dialog.component"; describe("AboutDialogComponent", () => { @@ -10,9 +15,16 @@ describe("AboutDialogComponent", () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ AboutDialogComponent ] + declarations: [ AboutDialogComponent ], + imports: [ HttpModule, PatternFlyNgModule ], + providers: [ + AboutService, + { provide: AppSettingsService, useClass: MockAppSettingsService }, + LoggerService ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/core/about-dialog/about-dialog.component.ts b/ngapp/src/app/core/about-dialog/about-dialog.component.ts index 9f7e14e2..425ef9aa 100644 --- a/ngapp/src/app/core/about-dialog/about-dialog.component.ts +++ b/ngapp/src/app/core/about-dialog/about-dialog.component.ts @@ -16,12 +16,11 @@ */ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from "@angular/core"; +import { AboutService } from "@core/about-dialog/about.service"; +import { LoggerService } from "@core/logger.service"; import { AboutEvent } from "app/core/about-dialog/about-event"; import { About } from "app/core/about-dialog/about.model"; -import { BsModalService } from "ngx-bootstrap/modal"; import { AboutModalConfig } from "patternfly-ng/modal"; -import { AboutService } from "@core/about-dialog/about.service"; -import { LoggerService } from "@core/logger.service"; @Component({ encapsulation: ViewEncapsulation.None, @@ -41,15 +40,14 @@ export class AboutDialogComponent implements OnInit { */ @Input() public info: About; - private aboutConfig: AboutModalConfig; + public aboutConfig: AboutModalConfig; private aboutService: AboutService; private logger: LoggerService; /** * The default contructor */ - constructor(private modalService: BsModalService, - logger: LoggerService, + constructor(logger: LoggerService, aboutService: AboutService) { this.aboutService = aboutService; this.logger = logger;