From a712f7155444f7069b1743cf13e47557672c0a7e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 29 Jun 2021 12:08:40 +0200
Subject: [PATCH] OZG-988 fix createdAt; adjust styling
---
.../src/lib/kommentar.model.ts | 6 +++---
.../kommentar.formservice.spec.ts | 14 +++++++-------
...ofile-in-kommentar-container.component.html | 4 ++--
...ofile-in-kommentar-container.component.scss | 4 ++++
...le-in-kommentar-container.component.spec.ts | 18 +++++++++++++++++-
5 files changed, 33 insertions(+), 13 deletions(-)
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 a3cf8bc8e0..940a89aac8 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 2aa530a886..46bea832e6 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 d0995f7613..6e8758e3da 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 46c047878d..bdb02c25f4 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 96f5a03ce0..33104e65b0 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
--
GitLab