Merge pull request primefaces#15646 from dobanisola-scottlogic/fix-ed…

…itor-unit-tests fix Editor and Table unit test
pete-mcwilliams · May 30, 2024 · d4daba0 · d4daba0
2 parents e2dc779 + 68698a8
commit d4daba0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/src/app/components/editor/editor.spec.ts b/src/app/components/editor/editor.spec.ts
@@ -1,4 +1,4 @@
-import { TestBed, ComponentFixture } from '@angular/core/testing';
+import { TestBed, ComponentFixture, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Editor } from './editor';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -7,15 +7,15 @@ describe('Editor', () => {
     let editor: Editor;
     let fixture: ComponentFixture<Editor>;
 
-    beforeEach(() => {
+    beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
             imports: [NoopAnimationsModule],
             declarations: [Editor]
         });
 
         fixture = TestBed.createComponent(Editor);
         editor = fixture.componentInstance;
-    });
+    }));
 
     it('should display by default', () => {
         fixture.detectChanges();
@@ -25,9 +25,7 @@ describe('Editor', () => {
     });
 
     it('should show value', () => {
-        editor.value = 'V';
-        fixture.detectChanges();
-
+        editor.writeValue('V');
         fixture.detectChanges();
 
         const paragraphEl = fixture.debugElement.query(By.css('.p-editor-content')).nativeElement.children[0].children[0];

diff --git a/src/app/components/table/table.spec.ts b/src/app/components/table/table.spec.ts
@@ -1238,9 +1238,9 @@ describe('Table', () => {
         fixture.detectChanges();
 
         expect(onColumnResizeEndSpy).toHaveBeenCalled();
-        expect(resizerEls[0].parentElement.clientWidth).toEqual(firstWidth - 30);
-        expect(resizerEls[0].parentElement.clientWidth).not.toEqual(firstWidth);
-        expect(defaultWidth).toEqual(resizerEls[0].parentElement.parentElement.clientWidth);
+        expect(resizerEls[0]?.parentElement?.clientWidth).toEqual(firstWidth - 30);
+        expect(resizerEls[0]?.parentElement?.clientWidth).not.toEqual(firstWidth);
+        expect(defaultWidth).toEqual(resizerEls[0]!.parentElement!.parentElement!.clientWidth);
     });
 
     it('should call resize and resizeColGroup with scrollableTable (fit)', () => {
@@ -1249,13 +1249,13 @@ describe('Table', () => {
         fixture.detectChanges();
 
         let resizerEls = document.getElementsByClassName('p-column-resizer');
-        let defaultWidth = resizerEls[0].parentElement.parentElement.clientWidth;
+        let defaultWidth = resizerEls[0]?.parentElement?.parentElement?.clientWidth;
         const onColumnResizeBeginSpy = spyOn(colResizeTable, 'onColumnResizeBegin').and.callThrough();
         const event: any = document.createEvent('CustomEvent');
         event.pageX = 450;
         event.which = 1;
         event.initEvent('mousedown');
-        let firstWidth = resizerEls[0].parentElement.clientWidth;
+        let firstWidth = resizerEls[0]?.parentElement?.clientWidth;
         resizerEls[0].dispatchEvent(event as MouseEvent);
         fixture.detectChanges();
 
@@ -1443,7 +1443,7 @@ describe('Table', () => {
     it('should open contextMenu and select row', () => {
         fixture.detectChanges();
 
-        const contextMenu = fixture.debugElement.query(By.css('.p-contextmenu')).componentInstance as ContextMenu;
+        const contextMenu = fixture.debugElement.query(By.directive(ContextMenu)).componentInstance;
         const showSpy = spyOn(contextMenu, 'show').and.callThrough();
         const contextMenuTableEl = fixture.debugElement.query(By.css('.contextMenuTable'));
         const rowEls = contextMenuTableEl.queryAll(By.css('tr'));
@@ -1465,7 +1465,7 @@ describe('Table', () => {
         contextMenuTable.contextMenuSelectionMode = 'joint';
         fixture.detectChanges();
 
-        const contextMenu = fixture.debugElement.query(By.css('.p-contextmenu')).componentInstance as ContextMenu;
+        const contextMenu = fixture.debugElement.query(By.directive(ContextMenu)).componentInstance;
         const showSpy = spyOn(contextMenu, 'show').and.callThrough();
         const contextMenuTableEl = fixture.debugElement.query(By.css('.contextMenuTable'));
         const rowEls = contextMenuTableEl.queryAll(By.css('tr'));
@@ -1487,7 +1487,7 @@ describe('Table', () => {
         contextMenuTable.contextMenuSelectionMode = 'joint';
         fixture.detectChanges();
 
-        const contextMenu = fixture.debugElement.query(By.css('.p-contextmenu')).componentInstance as ContextMenu;
+        const contextMenu = fixture.debugElement.query(By.directive(ContextMenu)).componentInstance;
         const showSpy = spyOn(contextMenu, 'show').and.callThrough();
         const contextMenuTableEl = fixture.debugElement.query(By.css('.contextMenuTable'));
         const rowEls = contextMenuTableEl.queryAll(By.css('tr'));