From 4924d0fa1e28558d46104fc1153ba8d09ab85ae2 Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Thu, 7 Mar 2024 17:12:22 +0000 Subject: [PATCH] [affected:*][ci:force] Fixing rebase --- .../content-metadata.component.html | 32 ++++++++++++------- .../content-metadata.component.spec.ts | 21 ++++++++---- .../dynamic-chip-list.component.spec.ts | 10 ++++-- .../rich-text-editor.component.spec.ts | 2 -- 4 files changed, 42 insertions(+), 23 deletions(-) diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html index 91cdcf87e5..57f6e2e62d 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html @@ -56,18 +56,26 @@ - - - - -
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts index c7a9c78202..cb40fc9995 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts @@ -36,12 +36,13 @@ import { TagsCreatorMode, TagService } from '@alfresco/adf-content-services'; +import { MatExpansionPanel } from '@angular/material/expansion'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { HttpClientModule } from '@angular/common/http'; import { MatDialogModule } from '@angular/material/dialog'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { MatTooltipModule } from '@angular/material/tooltip'; import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatTooltipModule } from '@angular/material/tooltip'; describe('ContentMetadataComponent', () => { let component: ContentMetadataComponent; @@ -290,7 +291,7 @@ describe('ContentMetadataComponent', () => { })); it('should save changedProperties on save click', fakeAsync(() => { - spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue(of([{ + getGroupedPropertiesSpy.and.returnValue(of([{ editable: true, title: 'test', properties: [] @@ -475,7 +476,7 @@ describe('ContentMetadataComponent', () => { beforeEach(() => { showErrorSpy = spyOn(notificationService, 'showError').and.stub(); - spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue(of([{ + getGroupedPropertiesSpy.and.returnValue(of([{ editable: true, title: 'test', properties: [] @@ -627,7 +628,7 @@ describe('ContentMetadataComponent', () => { }); it('should reset group edit ability on reset click', () => { - spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue(of([{ + getGroupedPropertiesSpy.and.returnValue(of([{ editable: true, title: 'test', properties: [] @@ -695,6 +696,8 @@ describe('ContentMetadataComponent', () => { }); it('should load the group properties on node change', () => { + getGroupedPropertiesSpy.and.stub(); + component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) }); expect(contentMetadataService.getGroupedProperties).toHaveBeenCalledWith(expectedNode, 'custom-preset'); @@ -717,6 +720,7 @@ describe('ContentMetadataComponent', () => { } ]; component.preset = presetConfig; + getGroupedPropertiesSpy.and.stub(); component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) }); @@ -786,7 +790,12 @@ describe('ContentMetadataComponent', () => { expect(contentMetadataService.getBasicProperties).toHaveBeenCalled(); }); - it('should revert changes for getGroupedProperties panel on cancel', () => { + it('should reload properties for group panel on cancel', () => { + getGroupedPropertiesSpy.and.returnValue(of([{ + editable: true, + title: 'test', + properties: [] + }])); component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) }); component.readOnly = false; fixture.detectChanges(); diff --git a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.spec.ts b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.spec.ts index 60aaaa07f0..51e206842a 100644 --- a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.spec.ts +++ b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.spec.ts @@ -81,9 +81,9 @@ describe('DynamicChipListComponent', () => { fixture.detectChanges(); await fixture.whenStable(); - expect(element.querySelector('#adf-dynamic-chip-list-chip-name-0').innerHTML).toBe('test1'); - expect(element.querySelector('#adf-dynamic-chip-list-chip-name-1').innerHTML).toBe('test2'); - expect(element.querySelector('#adf-dynamic-chip-list-chip-name-2').innerHTML).toBe('test3'); + expect(element.querySelector('#adf-dynamic-chip-list-chip-name-0')?.innerHTML).toBe('test1'); + expect(element.querySelector('#adf-dynamic-chip-list-chip-name-1')?.innerHTML).toBe('test2'); + expect(element.querySelector('#adf-dynamic-chip-list-chip-name-2')?.innerHTML).toBe('test3'); expect(element.querySelector('#adf-dynamic-chip-list-delete-test1')).not.toBe(null); expect(element.querySelector('#adf-dynamic-chip-list-delete-test2')).not.toBe(null); @@ -167,6 +167,10 @@ describe('DynamicChipListComponent', () => { element.style.maxWidth = '309px'; }); + afterEach(() =>{ + fixture.destroy(); + }); + it('should render view more button when limiting is enabled', fakeAsync(() => { renderChips(); component.ngOnChanges({ diff --git a/lib/process-services-cloud/src/lib/rich-text-editor/rich-text-editor.component.spec.ts b/lib/process-services-cloud/src/lib/rich-text-editor/rich-text-editor.component.spec.ts index 4a59b01541..e7923cadb0 100644 --- a/lib/process-services-cloud/src/lib/rich-text-editor/rich-text-editor.component.spec.ts +++ b/lib/process-services-cloud/src/lib/rich-text-editor/rich-text-editor.component.spec.ts @@ -18,9 +18,7 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; - import { RichTextEditorComponent } from './rich-text-editor.component'; -import { take } from 'rxjs'; describe('RichTextEditorComponent', () => { let component: RichTextEditorComponent;