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 index fbe7825d20..d5d1be5d1d 100644 --- 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/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts index 418aa5b77f..25dec485d3 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/features/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/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts index 0f02ebaf4d..eb08f04ef7 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts +++ b/src/frontend/packages/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/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts index a78c004789..657b2a422a 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts +++ b/src/frontend/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 :