Merge pull request #3917 from cloudfoundry-incubator/fix-unit-tests

Fix cf summary unit test failures
cloudfoundry · Sep 24, 2019 · 97257b0 · 97257b0
2 parents 05d8cea + 2a081d8
commit 97257b0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
 import { HttpModule } from '@angular/http';
 import { EffectsModule } from '@ngrx/effects';
 
+import { generateASEntities } from '../../cf-autoscaler/src/store/autoscaler-entity-generator';
 import { generateStratosEntities } from '../../core/src/base-entity-types';
 import { CATALOGUE_ENTITIES, EntityCatalogueFeatureModule } from '../../core/src/core/entity-catalogue.module';
 import { entityCatalogue, TestEntityCatalogue } from '../../core/src/core/entity-catalogue/entity-catalogue.service';
@@ -23,7 +24,8 @@ import { CloudFoundryStoreModule } from './store/cloud-foundry.store.module';
             testEntityCatalogue.clear();
             return [
               ...generateCFEntities(),
-              ...generateStratosEntities()
+              ...generateStratosEntities(),
+              ...generateASEntities(), // FIXME: CF should not depend on autoscaler. See #3916
             ];
           }
         }

diff --git a/.../cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts b/.../cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts
@@ -20,9 +20,17 @@ describe('CloudFoundrySummaryTabComponent', () => {
   beforeEach(
     async(() => {
       TestBed.configureTestingModule({
-        declarations: [CloudFoundrySummaryTabComponent, CardCfInfoComponent, CardCfRecentAppsComponent, CompactAppCardComponent],
+        declarations: [
+          CloudFoundrySummaryTabComponent,
+          CardCfInfoComponent,
+          CardCfRecentAppsComponent,
+          CompactAppCardComponent
+        ],
         imports: generateCfBaseTestModules(),
-        providers: [...generateTestCfEndpointServiceProvider(), TabNavService]
+        providers: [
+          ...generateTestCfEndpointServiceProvider(),
+          TabNavService
+        ]
       }).compileComponents();
     })
   );

diff --git a/...ges/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts b/...ges/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts
@@ -18,9 +18,17 @@ describe('CardCfInfoComponent', () => {
   beforeEach(
     async(() => {
       TestBed.configureTestingModule({
-        declarations: [CardCfInfoComponent, MetadataItemComponent, BooleanIndicatorComponent],
+        declarations: [
+          CardCfInfoComponent,
+          MetadataItemComponent,
+          BooleanIndicatorComponent
+        ],
         imports: generateCfBaseTestModulesNoShared(),
-        providers: [generateTestCfEndpointService(), UserInviteService, ConfirmationDialogService]
+        providers: [
+          generateTestCfEndpointService(),
+          UserInviteService,
+          ConfirmationDialogService
+        ]
       }).compileComponents();
     })
   );

diff --git a/...packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts b/...packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
@@ -45,6 +45,7 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
       map(entity => this.getDescription(entity))
     );
 
+    // FIXME: CF should not depend on autoscaler. See #3916
     this.autoscalerVersion$ = fetchAutoscalerInfo(this.cfEndpointService.cfGuid, this.esf).pipe(
       map(e => e.entityRequestInfo.error ?
         null :