From a4ed40685952a55b44b19dc763370eefd336440b 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 | 64 ++++++++----------- .../dynamic-chip-list.component.spec.ts | 10 ++- .../rich-text-editor.component.spec.ts | 2 - 4 files changed, 53 insertions(+), 55 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 28dac44485..fb0cabdc30 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; @@ -285,15 +286,11 @@ describe('ContentMetadataComponent', () => { })); it('should save changedProperties on save click', fakeAsync(() => { - spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue( - of([ - { - editable: true, - title: 'test', - properties: [] - } - ]) - ); + getGroupedPropertiesSpy.and.returnValue(of([{ + editable: true, + title: 'test', + properties: [] + }])); updateService.itemUpdated$.next({ changed: {} } as UpdateNotification); @@ -474,15 +471,11 @@ describe('ContentMetadataComponent', () => { beforeEach(() => { showErrorSpy = spyOn(notificationService, 'showError').and.stub(); - spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue( - of([ - { - editable: true, - title: 'test', - properties: [] - } - ]) - ); + getGroupedPropertiesSpy.and.returnValue(of([{ + editable: true, + title: 'test', + properties: [] + }])); component.displayCategories = true; component.displayTags = true; component.ngOnInit(); @@ -630,15 +623,11 @@ describe('ContentMetadataComponent', () => { }); it('should reset group edit ability on reset click', () => { - spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue( - of([ - { - editable: true, - title: 'test', - properties: [] - } - ]) - ); + getGroupedPropertiesSpy.and.returnValue(of([{ + editable: true, + title: 'test', + properties: [] + }])); component.ngOnInit(); component.readOnly = false; fixture.detectChanges(); @@ -702,6 +691,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'); @@ -724,6 +715,7 @@ describe('ContentMetadataComponent', () => { } ]; component.preset = presetConfig; + getGroupedPropertiesSpy.and.stub(); component.ngOnChanges({ node: new SimpleChange(node, expectedNode, false) }); @@ -794,15 +786,11 @@ describe('ContentMetadataComponent', () => { }); it('should reload properties for group panel on cancel', () => { - const getGroupedPropertiesSpy = spyOn(contentMetadataService, 'getGroupedProperties').and.returnValue( - of([ - { - editable: true, - title: 'test', - properties: [] - } - ]) - ); + 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 b3cdf53fb8..95a1f1349b 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 @@ -83,9 +83,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); @@ -182,6 +182,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 a60c73c8de..8c9c07bbc4 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;