Fix tests

ckeditor · Jun 17, 2024 · 70f98d2 · 70f98d2
1 parent 75395db
commit 70f98d2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/packages/ckeditor5-ui/src/dropdown/menu/dropdownmenurootlistview.ts b/packages/ckeditor5-ui/src/dropdown/menu/dropdownmenurootlistview.ts
@@ -104,7 +104,7 @@ export default class DropdownMenuRootListView extends DropdownMenuListView {
 	 *
 	 * @observable
 	 */
-	private readonly _menuPanelClass: string | null;
+	private readonly _menuPanelClass: string | undefined;
 
 	/**
 	 * The cached array of all menus in the dropdown menu.
@@ -144,7 +144,7 @@ export default class DropdownMenuRootListView extends DropdownMenuListView {
 		} );
 
 		this.editor = editor;
-		this._menuPanelClass = menuPanelClass || null;
+		this._menuPanelClass = menuPanelClass;
 		this._lazyInitializeSubMenus = !!lazyInitializeSubMenus;
 
 		this._setupIsOpenUpdater();

diff --git a/packages/ckeditor5-ui/tests/dropdown/menu/dropdownmenupanelview.js b/packages/ckeditor5-ui/tests/dropdown/menu/dropdownmenupanelview.js
@@ -28,16 +28,16 @@ describe( 'DropdownMenuPanelView', () => {
 	} );
 
 	describe( 'constructor()', () => {
-		it( 'should have #children view collection', () => {
-			expect( panelView.children ).to.be.instanceOf( ViewCollection );
+		it( 'should have #content view collection', () => {
+			expect( panelView.content ).to.be.instanceOf( ViewCollection );
 
 			const view = new View();
 
 			view.setTemplate( { tag: 'div' } );
 			view.render();
 
 			panelView.render();
-			panelView.children.add( view );
+			panelView.content.add( view );
 
 			expect( panelView.element.firstChild ).to.equal( view.element );
 		} );
@@ -99,7 +99,7 @@ describe( 'DropdownMenuPanelView', () => {
 				panelView.element.dispatchEvent( selectStartEvent );
 				sinon.assert.calledOnce( spy );
 
-				panelView.children.add( labeledInput );
+				panelView.content.add( labeledInput );
 
 				labeledInput.fieldView.element.dispatchEvent( selectStartEvent );
 				sinon.assert.calledOnce( spy );
@@ -111,7 +111,7 @@ describe( 'DropdownMenuPanelView', () => {
 				const firstChildView = new View();
 				const lastChildView = new View();
 
-				panelView.children.addMany( [ firstChildView, lastChildView ] );
+				panelView.content.addMany( [ firstChildView, lastChildView ] );
 
 				firstChildView.focus = sinon.spy();
 				lastChildView.focus = sinon.spy();
@@ -126,7 +126,7 @@ describe( 'DropdownMenuPanelView', () => {
 				const firstChildView = new View();
 				const lastChildView = new View();
 
-				panelView.children.addMany( [ firstChildView, lastChildView ] );
+				panelView.content.addMany( [ firstChildView, lastChildView ] );
 
 				firstChildView.focus = sinon.spy();
 				lastChildView.focus = sinon.spy();

diff --git a/packages/ckeditor5-ui/tests/dropdown/menu/dropdownmenuview.js b/packages/ckeditor5-ui/tests/dropdown/menu/dropdownmenuview.js
@@ -193,25 +193,17 @@ describe( 'DropdownMenuView', () => {
 				expect( menuView.panelView.position ).to.equal( newPositionName );
 			} );
 
-			it( 'should use the null position if none were considered optimal (because off the viewport, etc.)', () => {
-				sinon.stub( DropdownMenuView, '_getOptimalPosition' ).returns( null );
-
-				menuView.render();
-				menuView.panelView.position = null;
-				menuView.isOpen = true;
-
-				expect( menuView.panelView.position ).to.be.null;
-			} );
-
 			describe( 'when the UI language is LTR', () => {
 				it( 'should use a specific set of positioning functions in a specific priority order', () => {
-					const spy = sinon.spy( DropdownMenuView, '_getOptimalPosition' );
 					const locale = new Locale( { uiLanguage: 'pl' } );
 
 					createSubMenuWithLocale( locale );
 
+					const spy = sinon.spy( menuView.panelView, 'pin' );
+
 					menuView.isOpen = true;
 
+					expect( spy ).to.be.calledOnce;
 					expect( spy.firstCall.args[ 0 ].positions ).to.have.ordered.members( [
 						DropdownMenuViewPanelPositioningFunctions.eastSouth,
 						DropdownMenuViewPanelPositioningFunctions.eastNorth,
@@ -223,11 +215,12 @@ describe( 'DropdownMenuView', () => {
 
 			describe( 'when the UI language is RTL', () => {
 				it( 'should use a specific set of positioning functions in a specific priority order', () => {
-					const spy = sinon.spy( DropdownMenuView, '_getOptimalPosition' );
 					const locale = new Locale( { uiLanguage: 'ar' } );
 
 					createSubMenuWithLocale( locale );
 
+					const spy = sinon.spy( menuView.panelView, 'pin' );
+
 					menuView.isOpen = true;
 
 					expect( spy.firstCall.args[ 0 ].positions ).to.have.ordered.members( [