Upgrade Patternfly

- upgraded Patternfly to 3.1.1
- fixed some tests that were logging errors and shouldn't have been
- made style changes needed due to patternfly upgrade changes

ngapp/package.json

@@ -26,10 +26,10 @@
     "express": "^4.16.2",
     "ng2-codemirror": "^1.1.3",
     "ngx-bootstrap": "^2.0.1",
-    "patternfly": "^3.37.1",
-    "patternfly-ng": "^2.1.1",
+    "patternfly": "^3.28.0",
+    "patternfly-ng": "^3.1.1",
     "rxjs": "^5.5.5",
-    "zone.js": "^0.8.14"
+    "zone.js": "^0.8.20"
   },
   "devDependencies": {
     "@angular/cli": "1.3.2",
@@ -38,11 +38,11 @@
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "^6.0.92",
-    "codelyzer": "~3.1.1",
-    "jasmine-core": "~2.6.2",
+    "codelyzer": "~4.0.0",
+    "jasmine-core": "~2.8.0",
     "jasmine-spec-reporter": "~4.1.0",
     "karma": "~1.7.0",
-    "karma-chrome-launcher": "~2.1.1",
+    "karma-chrome-launcher": "~2.2.0",
     "karma-cli": "~1.0.1",
     "karma-coverage-istanbul-reporter": "^1.2.1",
     "karma-jasmine": "^1.1.1",
@@ -51,7 +51,7 @@
     "karma-phantomjs-launcher": "^1.0.4",
     "protractor": "~5.1.2",
     "ts-node": "~3.2.0",
-    "tslint": "~5.7.0",
+    "tslint": "~5.8.0",
     "typescript": "~2.6.2"
   }
 }

ngapp/src/app/activities/activities.component.spec.ts

@@ -8,7 +8,9 @@ import { FormsModule } from "@angular/forms";
 import { HttpModule } from "@angular/http";
 import { By } from "@angular/platform-browser";
 import { RouterTestingModule } from "@angular/router/testing";
+import { AppSettingsService } from "@core/app-settings.service";
 import { CoreModule } from "@core/core.module";
+import { MockAppSettingsService } from "@core/mock-app-settings.service";
 import { SharedModule } from "@shared/shared.module";
 import { ModalModule } from "ngx-bootstrap";
 
@@ -27,6 +29,7 @@ describe("ActivitiesComponent", () => {
       set: {
         providers: [
           { provide: ActivityService, useClass: MockActivityService },
+          { provide: AppSettingsService, useClass: MockAppSettingsService }
         ]
       }
     });

ngapp/src/app/activities/add-activity-wizard/add-activity-wizard.component.spec.ts

@@ -6,7 +6,9 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { RouterTestingModule } from "@angular/router/testing";
 import { ConnectionService } from "@connections/shared/connection.service";
 import { MockConnectionService } from "@connections/shared/mock-connection.service";
+import { AppSettingsService } from "@core/app-settings.service";
 import { CoreModule } from "@core/core.module";
+import { MockAppSettingsService } from "@core/mock-app-settings.service";
 import { PropertyFormPropertyComponent } from "@shared/property-form/property-form-property/property-form-property.component";
 import { PropertyFormComponent } from "@shared/property-form/property-form.component";
 import { PatternFlyNgModule } from "patternfly-ng";
@@ -21,6 +23,7 @@ describe("AddActivityWizardComponent", () => {
       imports: [ CoreModule, FormsModule, PatternFlyNgModule, ReactiveFormsModule, RouterTestingModule ],
       declarations: [ AddActivityWizardComponent, PropertyFormComponent, PropertyFormPropertyComponent ],
       providers: [
+        { provide: AppSettingsService, useClass: MockAppSettingsService },
         { provide: ActivityService, useClass: MockActivityService },
         { provide: ConnectionService, useClass: MockConnectionService }
       ]

ngapp/src/app/activities/add-activity/add-activity.component.spec.ts

@@ -7,7 +7,9 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { RouterTestingModule } from "@angular/router/testing";
 import { ConnectionService } from "@connections/shared/connection.service";
 import { MockConnectionService } from "@connections/shared/mock-connection.service";
+import { AppSettingsService } from "@core/app-settings.service";
 import { CoreModule } from "@core/core.module";
+import { MockAppSettingsService } from "@core/mock-app-settings.service";
 import { SharedModule } from "@shared/shared.module";
 import { PatternFlyNgModule } from "patternfly-ng";
 import { AddActivityComponent } from "./add-activity.component";
@@ -22,12 +24,29 @@ describe("AddActivityComponent", () => {
       declarations: [ AddActivityComponent, AddActivityWizardComponent ],
       providers: [
         { provide: ActivityService, useClass: MockActivityService },
+        { provide: AppSettingsService, useClass: MockAppSettingsService },
         { provide: ConnectionService, useClass: MockConnectionService }
       ]
     })
       .compileComponents().then(() => {
       // nothing to do
     });
+
+    TestBed.overrideComponent(
+      MockActivityService, {
+        set: {
+          providers: [ { provide: AppSettingsService, useClass: MockAppSettingsService } ]
+        }
+      }
+    );
+
+    TestBed.overrideComponent(
+      MockConnectionService, {
+        set: {
+          providers: [ { provide: AppSettingsService, useClass: MockAppSettingsService } ]
+        }
+      }
+    );
   }));
 
   beforeEach(() => {

ngapp/src/app/activities/shared/activity.service.spec.ts

@@ -3,17 +3,22 @@ import { inject, TestBed } from "@angular/core/testing";
 import { HttpModule } from "@angular/http";
 import { AppSettingsService } from "@core/app-settings.service";
 import { LoggerService } from "@core/logger.service";
+import { MockAppSettingsService } from "@core/mock-app-settings.service";
 
 describe("ActivityService", () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [ HttpModule ],
-      providers: [ActivityService, AppSettingsService, LoggerService]
+      providers: [
+        ActivityService,
+        { provide: AppSettingsService, useClass: MockAppSettingsService },
+        LoggerService]
     });
   });
 
   it("should be created", inject([ActivityService, AppSettingsService, LoggerService],
                                             (service: ActivityService, logger: LoggerService) => {
+    console.log("========== [ActivityService] should be created");
     expect(service).toBeTruthy();
   }));
 });