diff --git a/goofy-client/libs/kommentar-shared/src/lib/kommentar.model.ts b/goofy-client/libs/kommentar-shared/src/lib/kommentar.model.ts index a3cf8bc8e04b403b67ea0cf77175801a80e76735..940a89aac893fddb11bf28bbff6b3126900d443a 100644 --- a/goofy-client/libs/kommentar-shared/src/lib/kommentar.model.ts +++ b/goofy-client/libs/kommentar-shared/src/lib/kommentar.model.ts @@ -1,6 +1,6 @@ -import { CreateCommand } from "@goofy-client/command-shared"; -import { ListResource } from "@goofy-client/tech-shared"; -import { Resource } from "@ngxp/rest"; +import { CreateCommand } from '@goofy-client/command-shared'; +import { ListResource } from '@goofy-client/tech-shared'; +import { Resource } from '@ngxp/rest'; export interface Kommentar { createdByName: string; diff --git a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar.formservice.spec.ts b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar.formservice.spec.ts index 2aa530a886a7ba83c5d4c9ce338e3c873673f380..46bea832e60f4f1034979446a7ae181d94a2cf55 100644 --- a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar.formservice.spec.ts +++ b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar.formservice.spec.ts @@ -1,10 +1,10 @@ -import { FormBuilder } from "@angular/forms"; -import { KommentarResource, KommentarService } from "@goofy-client/kommentar-shared"; -import { createEmptyStateResource } from "@goofy-client/tech-shared"; -import { Mock, mock, useFromMock } from "@goofy-client/test-utils"; -import { createKommentarResource } from "libs/kommentar-shared/test/kommentar"; -import { of } from "rxjs"; -import { KommentarFormService } from "./kommentar.formservice"; +import { FormBuilder } from '@angular/forms'; +import { KommentarResource, KommentarService } from '@goofy-client/kommentar-shared'; +import { createEmptyStateResource } from '@goofy-client/tech-shared'; +import { Mock, mock, useFromMock } from '@goofy-client/test-utils'; +import { createKommentarResource } from 'libs/kommentar-shared/test/kommentar'; +import { of } from 'rxjs'; +import { KommentarFormService } from './kommentar.formservice'; describe('KommentarFormService', () => { let formService: KommentarFormService; diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.html b/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.html index d0995f7613ac537ae87cbf25ef5d4fb2142713f7..6e8758e3dad29469de1df81fac1de6e8d7bed8ad 100644 --- a/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.html +++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.html @@ -9,7 +9,7 @@ <span data-test-id="user-profile-in-kommentar-name"> {{userProfileStateResource.resource.firstName}} {{userProfileStateResource.resource.lastName}} </span> - <span data-test-id="user-profile-in-kommentar-created-at">{{userProfileStateResource.resource.createdAt | date: 'dd.MM.yy HH:mm' }}</span> </div> - </ng-container> + +<span class="created-at" data-test-id="user-profile-in-kommentar-created-at">{{kommentar.createdAt | date: 'dd.MM.yy HH:mm' }}</span> \ No newline at end of file diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.scss b/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.scss index 46c047878d3ed3622c521bb64a2890fc05d91c81..bdb02c25f43747650b35080672deab2369eecd77 100644 --- a/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.scss +++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.scss @@ -9,3 +9,7 @@ goofy-client-user-icon { transform-origin: left center; margin: -4px -8px -4px 0; } + +.created-at { + padding: 0 5px; +} \ No newline at end of file diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.spec.ts b/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.spec.ts index 96f5a03ce0d21cf55d11a7736eed7bcf2d2e8590..33104e65b0cef5d74421f9ea21a9cad4d9500568 100644 --- a/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.spec.ts +++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-kommentar-container/user-profile-in-kommentar-container.component.spec.ts @@ -1,8 +1,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { createStateResource } from '@goofy-client/tech-shared'; import { mock } from '@goofy-client/test-utils'; import { UserProfileService } from '@goofy-client/user-profile-shared'; +import { createKommentarResource } from 'libs/kommentar-shared/test/kommentar'; +import { createUserProfileResource } from 'libs/user-profile-shared/test/user-profile'; import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; +import { of } from 'rxjs'; import { UserIconComponent } from '../user-icon/user-icon.component'; import { UserProfileInKommentarContainerComponent } from './user-profile-in-kommentar-container.component'; @@ -10,7 +14,11 @@ describe('UserProfileInKommentarContainerComponent', () => { let component: UserProfileInKommentarContainerComponent; let fixture: ComponentFixture<UserProfileInKommentarContainerComponent>; - const userProfileService = mock(UserProfileService); + const kommentarCreatedAt: string = '[data-test-id="user-profile-in-kommentar-created-at"]'; + + const userProfileService = { ...mock(UserProfileService), getAssignedUserProfile: () => of(createStateResource(createUserProfileResource())) }; + + const createdAt: Date = new Date('2021-06-29T11:50:00'); configureTestSuite(() => { TestBed.configureTestingModule({ @@ -30,10 +38,18 @@ describe('UserProfileInKommentarContainerComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(UserProfileInKommentarContainerComponent); component = fixture.componentInstance; + component.kommentar = { ...createKommentarResource(), createdAt }; fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + it('should show createdAt from kommentar', () => { + const element = fixture.nativeElement.querySelector(kommentarCreatedAt); + + expect(element).toBeInstanceOf(HTMLElement); + expect((<HTMLElement>element).innerHTML).toEqual('29.06.21 11:50'); + }) }); \ No newline at end of file