Skip to content
Snippets Groups Projects
Commit 3ec8a637 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5588 fix reload vorgang after abgeschlossen/bescheiden

parent a2ccf159
No related branches found
No related tags found
No related merge requests found
...@@ -21,19 +21,25 @@ ...@@ -21,19 +21,25 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen * Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CommandResource } from '@alfa-client/command-shared';
import { HasLinkPipe, createStateResource } from '@alfa-client/tech-shared'; import {
HasLinkPipe,
StateResource,
createEmptyStateResource,
createStateResource,
} from '@alfa-client/tech-shared';
import { mock } from '@alfa-client/test-utils'; import { mock } from '@alfa-client/test-utils';
import { import {
IconButtonWithSpinnerComponent, IconButtonWithSpinnerComponent,
OzgcloudStrokedButtonWithSpinnerComponent, OzgcloudStrokedButtonWithSpinnerComponent,
} from '@alfa-client/ui'; } from '@alfa-client/ui';
import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared'; import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createCommandResource } from 'libs/command-shared/test/command'; import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs'; import { Observable, of } from 'rxjs';
import { AbschliessenButtonComponent } from './abschliessen-button.component'; import { AbschliessenButtonComponent } from './abschliessen-button.component';
describe('AbschliessenButtonComponent', () => { describe('AbschliessenButtonComponent', () => {
...@@ -84,11 +90,28 @@ describe('AbschliessenButtonComponent', () => { ...@@ -84,11 +90,28 @@ describe('AbschliessenButtonComponent', () => {
}); });
describe('abschliessen', () => { describe('abschliessen', () => {
const command: CommandResource = createCommandResource();
const comandStateResource$: Observable<StateResource<CommandResource>> = of(
createStateResource(command),
);
beforeEach(() => {
vorgangCommandService.abschliessen.mockReturnValue(comandStateResource$);
});
it('should call vorgang service', () => { it('should call vorgang service', () => {
component.abschliessen(); component.abschliessen();
expect(vorgangCommandService.abschliessen).toHaveBeenCalled(); expect(vorgangCommandService.abschliessen).toHaveBeenCalled();
}); });
it('should assign response', () => {
component.commandStateResource$ = of(createEmptyStateResource<CommandResource>());
component.abschliessen();
expect(component.commandStateResource$).toBe(comandStateResource$);
});
}); });
describe('abschliessen button', () => { describe('abschliessen button', () => {
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen * Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { Component, Input, OnInit } from '@angular/core';
import { CommandResource } from '@alfa-client/command-shared'; import { CommandResource } from '@alfa-client/command-shared';
import { StateResource, createEmptyStateResource } from '@alfa-client/tech-shared'; import { StateResource, createEmptyStateResource } from '@alfa-client/tech-shared';
import { import {
...@@ -29,6 +28,7 @@ import { ...@@ -29,6 +28,7 @@ import {
VorgangWithEingangLinkRel, VorgangWithEingangLinkRel,
VorgangWithEingangResource, VorgangWithEingangResource,
} from '@alfa-client/vorgang-shared'; } from '@alfa-client/vorgang-shared';
import { Component, Input, OnInit } from '@angular/core';
import { Observable, of } from 'rxjs'; import { Observable, of } from 'rxjs';
@Component({ @Component({
...@@ -53,6 +53,6 @@ export class AbschliessenButtonComponent implements OnInit { ...@@ -53,6 +53,6 @@ export class AbschliessenButtonComponent implements OnInit {
} }
public abschliessen(): void { public abschliessen(): void {
this.vorgangCommandService.abschliessen(this.vorgang); this.commandStateResource$ = this.vorgangCommandService.abschliessen(this.vorgang);
} }
} }
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { BescheidResource, BescheidService } from '@alfa-client/bescheid-shared'; import { BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
import { CommandResource } from '@alfa-client/command-shared';
import { import {
HasLinkPipe, HasLinkPipe,
StateResource, StateResource,
...@@ -41,10 +42,11 @@ import { ...@@ -41,10 +42,11 @@ import {
} from '@alfa-client/vorgang-shared'; } from '@alfa-client/vorgang-shared';
import { DialogRef } from '@angular/cdk/dialog'; import { DialogRef } from '@angular/cdk/dialog';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs'; import { Observable, of } from 'rxjs';
import { createBescheidResource } from '../../../../../bescheid-shared/src/test/bescheid'; import { createBescheidResource } from '../../../../../bescheid-shared/src/test/bescheid';
import { BescheidenDialogData } from '../../vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.model'; import { BescheidenDialogData } from '../../vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.model';
import { VorgangDetailBescheidenComponent } from '../../vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component'; import { VorgangDetailBescheidenComponent } from '../../vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component';
...@@ -171,33 +173,51 @@ describe('BescheidenButtonComponent', () => { ...@@ -171,33 +173,51 @@ describe('BescheidenButtonComponent', () => {
}); });
describe('onClick', () => { describe('onClick', () => {
it('should open bescheid wizard when create bescheid draft link exists', () => { describe('should open bescheid wizard', () => {
beforeEach(() => {
component.openBescheidenWizard = jest.fn(); component.openBescheidenWizard = jest.fn();
component.vorgang = createVorgangWithEingangResource([ component.vorgang = createVorgangWithEingangResource([
VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT, VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT,
]); ]);
});
it('should open bescheid wizard when create bescheid draft link exists', () => {
component.onClick(); component.onClick();
expect(component.openBescheidenWizard).toHaveBeenCalled(); expect(component.openBescheidenWizard).toHaveBeenCalled();
}); });
it('should open bescheid wizard when bescheid draft exists', () => { it('should open bescheid wizard when bescheid draft exists', () => {
component.openBescheidenWizard = jest.fn();
component.vorgang = createVorgangWithEingangResource([
VorgangWithEingangLinkRel.BESCHEID_DRAFT,
]);
component.onClick(); component.onClick();
expect(component.openBescheidenWizard).toHaveBeenCalled(); expect(component.openBescheidenWizard).toHaveBeenCalled();
}); });
});
describe('should do bescheiden', () => {
const command: CommandResource = createCommandResource();
const comandStateResource$: Observable<StateResource<CommandResource>> = of(
createStateResource(command),
);
beforeEach(() => {
vorgangCommandService.bescheiden.mockReturnValue(comandStateResource$);
});
it('should call vorgangCommandService.bescheiden', () => { it('should call vorgangCommandService.bescheiden', () => {
component.onClick(); component.onClick();
expect(vorgangCommandService.bescheiden).toHaveBeenCalled(); expect(vorgangCommandService.bescheiden).toHaveBeenCalled();
}); });
it('should assign response', () => {
component.commandStateResource$ = of(createEmptyStateResource<CommandResource>());
component.onClick();
expect(component.commandStateResource$).toBe(comandStateResource$);
});
});
}); });
describe('bescheiden icon button', () => { describe('bescheiden icon button', () => {
......
...@@ -76,7 +76,7 @@ export class BescheidenButtonComponent implements OnInit { ...@@ -76,7 +76,7 @@ export class BescheidenButtonComponent implements OnInit {
if (this.shouldOpenBescheidenWizard()) { if (this.shouldOpenBescheidenWizard()) {
this.openBescheidenWizard(); this.openBescheidenWizard();
} else { } else {
this.vorgangCommandService.bescheiden(this.vorgang); this.commandStateResource$ = this.vorgangCommandService.bescheiden(this.vorgang);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment