fixed tests

fabric8-launcher · Oct 3, 2018 · 434af26 · 434af26
1 parent 82e3649
commit 434af26
Show file tree

Hide file tree

Showing 33 changed files with 114 additions and 405 deletions.
diff --git a/...activate-booster-createapp-nextstep/activate-booster-createapp-nextstep.component.spec.ts b/...activate-booster-createapp-nextstep/activate-booster-createapp-nextstep.component.spec.ts
@@ -5,31 +5,21 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { ActivateBoosterCreateappNextstepComponent } from './activate-booster-createapp-nextstep.component';
 import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
-import { Projectile, StepState } from '../../model/summary.model';
+import { Projectile, StepState } from '../../model/projectile.model';
 import { TargetEnvironmentSelection } from '../../model/target-environment.model';
 
 export interface TypeWizardComponent {
   selectedSection: string;
   steps: LauncherStep[];
-  summary: any;
   summaryCompleted: boolean;
   addStep(step: LauncherStep): void;
 }
 
-let mockWizardComponent: TypeWizardComponent = {
+const mockWizardComponent: TypeWizardComponent = {
   selectedSection: '',
   steps: [],
-  summary: {
-    dependencyCheck: {},
-    gitHubDetails: {}
-  },
   summaryCompleted: false,
   addStep(step: LauncherStep) {
-    for (let i = 0; i < this.steps.length; i++) {
-      if (step.id === this.steps[i].id) {
-        return;
-      }
-    }
     this.steps.push(step);
   }
 };
@@ -40,7 +30,6 @@ describe('ActivateBoosterComponent', () => {
 
   beforeEach(async(() => {
     const projectile = new Projectile<any>();
-    projectile.setState('TargetEnvironment', new StepState(new TargetEnvironmentSelection(), []));
     TestBed.configureTestingModule({
       imports: [
         CommonModule,

diff --git a/...ents/activate-booster-createapp-nextstep/activate-booster-createapp-nextstep.component.ts b/...ents/activate-booster-createapp-nextstep/activate-booster-createapp-nextstep.component.ts
@@ -5,7 +5,7 @@ import {
 } from '@angular/core';
 
 import { LauncherComponent } from '../../launcher.component';
-import { Projectile } from '../../model/summary.model';
+import { Projectile } from '../../model/projectile.model';
 import { DependencyCheck } from '../../model/dependency-check.model';
 import { TargetEnvironmentSelection } from '../../model/target-environment.model';
 
@@ -22,6 +22,6 @@ export class ActivateBoosterCreateappNextstepComponent {
   }
 
   get dependencyCheck(): DependencyCheck {
-    return this.projectile.getState('TargetEnvironment').state.dependencyCheck;
+    return this.projectile.sharedState.state;
   }
 }
diff --git a/...-launcher/src/lib/components/dependency-editor-step/dependency-editor-review.component.ts b/...-launcher/src/lib/components/dependency-editor-step/dependency-editor-review.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ReviewComponent } from '../../review.component';
 import { Broadcaster } from 'ngx-base';
-import { Projectile } from '../../model/summary.model';
+import { Projectile } from '../../model/projectile.model';
 
 @Component({
   selector: 'f8launcher-dependency-editor-review',

diff --git a/...uncher/src/lib/components/dependency-editor-step/dependency-editor-step.component.spec.ts b/...uncher/src/lib/components/dependency-editor-step/dependency-editor-step.component.spec.ts
@@ -10,13 +10,12 @@ import { DependencyCheck } from '../../launcher.module';
 import { DependencyCheckService } from '../../service/dependency-check.service';
 import { DependencyEditorService } from '../../service/dependency-editor.service';
 import { DependencyEditorCreateappStepComponent } from './dependency-editor-step.component';
-import { LauncherComponent } from '../../launcher.component';
-import { LauncherStep } from '../../launcher-step';
 import { HelperService } from '../../service/helper.service';
 import { TokenProvider } from '../../../lib/service/token-provider';
 import { BroadcasterTestProvider } from '../targetenvironment-createapp-step/target-environment-createapp-step.component.spec';
 import { DemoDependencyEditorService } from '../../../../../../src/app/service/demo-dependency-editor.service';
-import { Projectile, StepState } from '../../model/summary.model';
+import { Projectile, StepState } from '../../model/projectile.model';
+import { ButtonNextStepComponent } from '../../shared/button-next-step.component';
 
 const mockHelperService = {
   getBackendUrl(): string {
@@ -34,30 +33,12 @@ const mockDependencyCheckService = {
       groupId: 'io.openshift.booster',
       projectName: 'App_test_1',
       projectVersion: '1.0.0-SNAPSHOT',
-      spacePath: '/myspace'
+      spacePath: '/myspace',
+      targetEnvironment: undefined
     });
   }
 };
 
-export interface TypeWizardComponent {
-  steps: LauncherStep[];
-  summaryCompleted: boolean;
-  addStep(step: LauncherStep): void;
-}
-
-const mockWizardComponent: TypeWizardComponent = {
-  steps: [],
-  summaryCompleted: false,
-  addStep(step: LauncherStep) {
-    for (let i = 0; i < this.steps.length; i++) {
-      if (step.id === this.steps[i].id) {
-        return;
-      }
-    }
-    this.steps.push(step);
-  }
-};
-
 describe('DependencyEditorCreateappStepComponent', () => {
   let component: DependencyEditorCreateappStepComponent;
   let fixture: ComponentFixture<DependencyEditorCreateappStepComponent>;
@@ -73,7 +54,8 @@ describe('DependencyEditorCreateappStepComponent', () => {
         RouterTestingModule
       ],
       declarations: [
-        DependencyEditorCreateappStepComponent
+        DependencyEditorCreateappStepComponent,
+        ButtonNextStepComponent
       ],
       providers : [
         { provide: Projectile, useValue: projectile },
@@ -85,9 +67,6 @@ describe('DependencyEditorCreateappStepComponent', () => {
           provide: DependencyEditorService, useClass: DemoDependencyEditorService
         },
         { provide: HelperService, useValue: mockHelperService },
-        {
-          provide: LauncherComponent, useValue: mockWizardComponent
-        },
         { provide: Broadcaster, useValue: BroadcasterTestProvider.broadcaster }
       ]
     }).compileComponents();

diff --git a/...gx-launcher/src/lib/components/dependency-editor-step/dependency-editor-step.component.ts b/...gx-launcher/src/lib/components/dependency-editor-step/dependency-editor-step.component.ts
@@ -15,8 +15,7 @@ import { DependencyEditorService } from '../../service/dependency-editor.service
 import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
 import { DependencyEditor } from '../../model/dependency-editor/dependency-editor.model';
-import { broadcast } from '../../shared/telemetry.decorator';
-import { Projectile, StepState } from '../../model/summary.model';
+import { Projectile, StepState } from '../../model/projectile.model';
 import { DependencyCheck } from '../../model/dependency-check.model';
 
 import * as _ from 'lodash';
@@ -64,8 +63,10 @@ export class DependencyEditorCreateappStepComponent extends LauncherStep impleme
           } else {
             booster.mission['boosters'].forEach((b: any) => {
               if (booster.mission.id === b.mission.id && booster.runtime.id === b.runtime.id) {
+                if (b.source && b.source.git) {
                   this.github = b.source.git.url;
                   this.gitref = b.source.git.ref;
+                }
               }
             });
           }

diff --git a/...r/src/lib/components/gitprovider-createapp-step/gitprovider-createapp-review.component.ts b/...r/src/lib/components/gitprovider-createapp-step/gitprovider-createapp-review.component.ts
@@ -1,7 +1,7 @@
 import { ReviewComponent } from '../../review.component';
 import { Component, Input } from '@angular/core';
 import { Broadcaster } from 'ngx-base';
-import { Projectile } from '../../model/summary.model';
+import { Projectile } from '../../model/projectile.model';
 
 @Component({
   selector: 'f8launcher-gitprovider-createapp-review',

diff --git a/...rc/lib/components/gitprovider-createapp-step/gitprovider-createapp-step.component.spec.ts b/...rc/lib/components/gitprovider-createapp-step/gitprovider-createapp-step.component.spec.ts
@@ -5,30 +5,15 @@ import { FormsModule } from '@angular/forms';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Observable, of } from 'rxjs';
 
-import { PopoverModule } from 'ngx-bootstrap';
+import { PopoverModule, TypeaheadModule } from 'ngx-bootstrap';
 
-import { LauncherComponent } from '../../launcher.component';
-import { LauncherStep } from '../../launcher-step';
-
-import { DependencyCheck } from '../../launcher.module';
-import { DependencyCheckService } from '../../service/dependency-check.service';
 import { GitproviderCreateappStepComponent } from './gitprovider-createapp-step.component';
 import { GitProviderService } from '../../service/git-provider.service';
 
 import { GitHubDetails } from '../../model/github-details.model';
-import { Projectile } from '../../model/summary.model';
-
-const mockDependencyCheckService = {
-  getDependencyCheck(): Observable<DependencyCheck> {
-    return of({
-      mavenArtifact: 'd4-345',
-      groupId: 'io.openshift.booster',
-      projectName: 'App_test_1',
-      projectVersion: '1.0.0-SNAPSHOT',
-      spacePath: '/myspace'
-    });
-  }
-};
+import { Projectile } from '../../model/projectile.model';
+import { ButtonNextStepComponent } from '../../shared/button-next-step.component';
+import { GitProviderRepositoryValidatorDirective } from './gitprovider-repository.validator';
 
 const mockGitProviderService = {
   connectGitHubAccount(redirectUrl: string): void {
@@ -53,25 +38,6 @@ const mockGitProviderService = {
   }
 };
 
-export interface TypeWizardComponent {
-  steps: LauncherStep[];
-  summaryCompleted: boolean;
-  addStep(step: LauncherStep): void;
-}
-
-const mockWizardComponent: TypeWizardComponent = {
-  steps: [],
-  summaryCompleted: false,
-  addStep(step: LauncherStep) {
-    for (let i = 0; i < this.steps.length; i++) {
-      if (step.id === this.steps[i].id) {
-        return;
-      }
-    }
-    this.steps.push(step);
-  }
-};
-
 describe('GitProviderStepComponent', () => {
   let component: GitproviderCreateappStepComponent;
   let fixture: ComponentFixture<GitproviderCreateappStepComponent>;
@@ -83,21 +49,18 @@ describe('GitProviderStepComponent', () => {
         CommonModule,
         FormsModule,
         PopoverModule.forRoot(),
-        RouterTestingModule
+        RouterTestingModule,
+        TypeaheadModule
       ],
       declarations: [
-        GitproviderCreateappStepComponent
+        GitproviderCreateappStepComponent,
+        ButtonNextStepComponent,
+        GitProviderRepositoryValidatorDirective
       ],
       providers: [
         Projectile,
-        {
-          provide: DependencyCheckService, useValue: mockDependencyCheckService
-        },
         {
           provide: GitProviderService, useValue: mockGitProviderService
-        },
-        {
-          provide: LauncherComponent, useValue: mockWizardComponent
         }
       ]
     }).compileComponents();

diff --git a/...her/src/lib/components/gitprovider-createapp-step/gitprovider-createapp-step.component.ts b/...her/src/lib/components/gitprovider-createapp-step/gitprovider-createapp-step.component.ts
@@ -18,7 +18,7 @@ import { LauncherComponent } from '../../launcher.component';
 import { LauncherStep } from '../../launcher-step';
 import { broadcast } from '../../shared/telemetry.decorator';
 import { GitHubDetails } from '../../model/github-details.model';
-import { Projectile, StepState } from '../../model/summary.model';
+import { Projectile, StepState } from '../../model/projectile.model';
 
 @Component({
   encapsulation: ViewEncapsulation.None,

diff --git a/...b/components/mission-runtime-createapp-step/mission-runtime-createapp-review.component.ts b/...b/components/mission-runtime-createapp-step/mission-runtime-createapp-review.component.ts
@@ -2,7 +2,7 @@ import { ReviewComponent } from '../../review.component';
 import { Component, Input } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { Broadcaster } from 'ngx-base';
-import { Projectile } from '../../model/summary.model';
+import { Projectile } from '../../model/projectile.model';
 
 @Component({
   selector: 'f8launcher-mission-runtime-createapp-review',

diff --git a/...omponents/mission-runtime-createapp-step/mission-runtime-createapp-step.component.spec.ts b/...omponents/mission-runtime-createapp-step/mission-runtime-createapp-step.component.spec.ts
@@ -8,8 +8,6 @@ import { Broadcaster } from 'ngx-base';
 import { BsDropdownModule, PopoverModule } from 'ngx-bootstrap';
 import { SortArrayPipeModule, TruncatePipeModule } from 'patternfly-ng/pipe';
 
-import { LauncherComponent } from '../../launcher.component';
-import { LauncherStep } from '../../launcher-step';
 import { MissionRuntimeCreateappStepComponent } from './mission-runtime-createapp-step.component';
 import { MissionRuntimeService } from '../../service/mission-runtime.service';
 import { Mission } from '../../model/mission.model';
@@ -18,7 +16,8 @@ import { createBooster, createMission, createRuntime } from '../../service/missi
 import { BroadcasterTestProvider } from '../targetenvironment-createapp-step/target-environment-createapp-step.component.spec';
 import { Observable, of } from 'rxjs';
 import { Catalog } from '../../model/catalog.model';
-import { Projectile } from '../../model/summary.model';
+import { Projectile } from '../../model/projectile.model';
+import { ButtonNextStepComponent } from '../../shared/button-next-step.component';
 
 
 const longDescription = `An innovative approach to packaging and running Java EE applications,
@@ -48,26 +47,6 @@ class TestMissionRuntimeService extends MissionRuntimeService {
   }
 }
 
-
-export interface TypeWizardComponent {
-  steps: LauncherStep[];
-  summaryCompleted: boolean;
-  addStep(step: LauncherStep): void;
-}
-
-const mockWizardComponent: TypeWizardComponent = {
-  steps: [],
-  summaryCompleted: false,
-  addStep(step: LauncherStep) {
-      for (let i = 0; i < this.steps.length; i++) {
-        if (step.id === this.steps[i].id) {
-          return;
-        }
-      }
-      this.steps.push(step);
-  }
-};
-
 describe('MissionRuntimeStepComponent', () => {
   let component: MissionRuntimeCreateappStepComponent;
   let fixture: ComponentFixture<MissionRuntimeCreateappStepComponent>;
@@ -113,16 +92,14 @@ describe('MissionRuntimeStepComponent', () => {
         TruncatePipeModule
       ],
       declarations: [
-        MissionRuntimeCreateappStepComponent
+        MissionRuntimeCreateappStepComponent,
+        ButtonNextStepComponent
       ],
       providers: [
         Projectile,
         {
           provide: MissionRuntimeService, useClass: TestMissionRuntimeService
         },
-        {
-          provide: LauncherComponent, useValue: mockWizardComponent
-        },
         { provide: Broadcaster, useValue: BroadcasterTestProvider.broadcaster }
       ]
     }).compileComponents();

diff --git a/...lib/components/mission-runtime-createapp-step/mission-runtime-createapp-step.component.ts b/...lib/components/mission-runtime-createapp-step/mission-runtime-createapp-step.component.ts
@@ -16,7 +16,7 @@ import {
   ViewRuntime
 } from './mission-runtime-createapp-step.model';
 import { broadcast } from '../../shared/telemetry.decorator';
-import { Projectile, StepState } from '../../model/summary.model';
+import { Projectile, StepState } from '../../model/projectile.model';
 import { Cluster } from '../../model/cluster.model';
 
 
@@ -41,7 +41,7 @@ export class MissionRuntimeCreateappStepComponent extends LauncherStep implement
 
   private subscriptions: Subscription[] = [];
 
-  constructor(@Host() @Optional() private launcherComponent: LauncherComponent,
+  constructor(@Host() @Optional() public launcherComponent: LauncherComponent,
               private missionRuntimeService: MissionRuntimeService,
               public _DomSanitizer: DomSanitizer,
               private projectile: Projectile<BoosterState>,

diff --git a/...project-progress-createapp-nextstep/project-progress-createapp-nextstep.component.spec.ts b/...project-progress-createapp-nextstep/project-progress-createapp-nextstep.component.spec.ts
@@ -9,7 +9,8 @@ import { LauncherComponent } from '../../launcher.component';
 import { ProjectSummaryService } from '../../service/project-summary.service';
 import { Broadcaster } from 'ngx-base';
 import { BroadcasterTestProvider } from '../targetenvironment-createapp-step/target-environment-createapp-step.component.spec';
-import { Projectile } from '../../model/summary.model';
+import { Projectile } from '../../model/projectile.model';
+import { ButtonNextStepComponent } from '../../shared/button-next-step.component';
 
 const progressSubject: Subject<Progress[]> = new Subject();
 const mockProjectProgressService = {
@@ -44,7 +45,8 @@ describe('ProjectProgressComponent', () => {
         CommonModule
       ],
       declarations: [
-        ProjectProgressCreateappNextstepComponent
+        ProjectProgressCreateappNextstepComponent,
+        ButtonNextStepComponent
       ],
       providers: [
         Projectile,

diff --git a/...ents/project-progress-createapp-nextstep/project-progress-createapp-nextstep.component.ts b/...ents/project-progress-createapp-nextstep/project-progress-createapp-nextstep.component.ts
@@ -5,7 +5,7 @@ import { ProjectProgressService } from '../../service/project-progress.service';
 import { LauncherComponent } from '../../launcher.component';
 import { ProjectSummaryService } from '../../service/project-summary.service';
 import { Broadcaster } from 'ngx-base';
-import { Projectile } from '../../model/summary.model';
+import { Projectile } from '../../model/projectile.model';
 
 @Component({
   encapsulation: ViewEncapsulation.None,