test: Update tests to match latest logic

Author: dcalhoun

src/utils/editor-environment.test.js

@@ -15,7 +15,6 @@ import { initializeVideoPressAjaxBridge } from './videopress-bridge.js';
 import { configureLocale } from './localization.js';
 import { initializeApiFetch } from './api-fetch.js';
 import { initializeEditor } from './editor.jsx';
-import { unregisterDisallowedBlocks } from './blocks.js';
 
 vi.mock( './bridge.js' );
 vi.mock( './logger.js' );
@@ -43,10 +42,6 @@ vi.mock( './editor.jsx', () => ( {
 	initializeEditor: vi.fn(),
 } ) );
 
-vi.mock( './blocks.js', () => ( {
-	unregisterDisallowedBlocks: vi.fn(),
-} ) );
-
 describe( 'setUpEditorEnvironment', () => {
 	beforeEach( () => {
 		vi.clearAllMocks();
@@ -105,7 +100,7 @@ describe( 'setUpEditorEnvironment', () => {
 		] );
 	} );
 
-	it( 'loads plugins and unregisters disallowed blocks when plugins enabled', async () => {
+	it( 'loads plugins when plugins enabled', async () => {
 		getGBKit.mockReturnValue( { plugins: true } );
 
 		const allowedTypes = [ 'core/paragraph', 'core/heading', 'core/image' ];
@@ -116,9 +111,6 @@ describe( 'setUpEditorEnvironment', () => {
 		await setUpEditorEnvironment();
 
 		expect( loadEditorAssets ).toHaveBeenCalledTimes( 1 );
-		expect( unregisterDisallowedBlocks ).toHaveBeenCalledWith(
-			allowedTypes
-		);
 	} );
 
 	it( 'skips plugin loading when plugins configuration is disabled', async () => {
@@ -127,7 +119,6 @@ describe( 'setUpEditorEnvironment', () => {
 		await setUpEditorEnvironment();
 
 		expect( loadEditorAssets ).not.toHaveBeenCalled();
-		expect( unregisterDisallowedBlocks ).not.toHaveBeenCalled();
 	} );
 
 	it( 'skips plugin loading when plugins configuration is undefined', async () => {
@@ -136,7 +127,6 @@ describe( 'setUpEditorEnvironment', () => {
 		await setUpEditorEnvironment();
 
 		expect( loadEditorAssets ).not.toHaveBeenCalled();
-		expect( unregisterDisallowedBlocks ).not.toHaveBeenCalled();
 	} );
 
 	it( 'handles errors during initialization', async () => {
@@ -188,7 +178,9 @@ describe( 'setUpEditorEnvironment', () => {
 		getGBKit.mockReturnValue( { plugins: true } );
 
 		const testError = new Error( 'Plugin loading failed' );
-		loadEditorAssets.mockRejectedValue( testError );
+		initializeEditor.mockImplementation( () => {
+			throw testError;
+		} );
 
 		await setUpEditorEnvironment();
 

src/utils/editor.test.jsx

@@ -11,13 +11,15 @@ import { registerCoreBlocks } from '@wordpress/block-library';
 import { initializeEditor } from './editor';
 import { getGBKit, getPost } from './bridge';
 import { getDefaultEditorSettings } from './editor-settings';
+import { unregisterDisallowedBlocks } from './blocks';
 
 vi.mock( '@wordpress/editor', () => ( {
 	store: { name: 'core/editor' },
 } ) );
 vi.mock( '@wordpress/data' );
 vi.mock( '@wordpress/preferences' );
 vi.mock( '@wordpress/block-library' );
+vi.mock( './blocks' );
 vi.mock( './bridge' );
 vi.mock( './editor-settings' );
 vi.mock( '../components/layout', () => ( {
@@ -137,6 +139,16 @@ describe( 'initializeEditor', () => {
 		);
 	} );
 
+	it( 'should pass allowedBlockTypes to unregisterDisallowedBlocks', () => {
+		const allowedBlockTypes = [ 'core/paragraph', 'core/heading' ];
+
+		initializeEditor( { allowedBlockTypes } );
+
+		expect( unregisterDisallowedBlocks ).toHaveBeenCalledWith(
+			allowedBlockTypes
+		);
+	} );
+
 	it( 'should register core blocks', () => {
 		initializeEditor();