Fix unit tests

Author: ellatrix

packages/block-editor/src/store/private-selectors.js

@@ -15,7 +15,6 @@ import {
 	getBlockOrder,
 	getBlockParents,
 	getBlockEditingMode,
-	getBlockRootClientId,
 	getSettings,
 	canInsertBlockType,
 } from './selectors';
@@ -24,6 +23,8 @@ import { INSERTER_PATTERN_TYPES } from '../components/inserter/block-patterns-ta
 import { store } from './';
 import { unlock } from '../lock-unlock';
 
+export { getSelectedBlockClientIdsUnmemoized } from './utils';
+
 /**
  * Returns true if the block interface is hidden, or false otherwise.
  *
@@ -49,39 +50,6 @@ export function getBlockWithoutAttributes( state, clientId ) {
 	return state.blocks.byClientId.get( clientId );
 }
 
-const EMPTY_ARRAY = [];
-
-export function getSelectedBlockClientIdsUnmemoized( state ) {
-	const { selectionStart, selectionEnd } = state.selection;
-
-	if ( ! selectionStart.clientId || ! selectionEnd.clientId ) {
-		return EMPTY_ARRAY;
-	}
-
-	if ( selectionStart.clientId === selectionEnd.clientId ) {
-		return [ selectionStart.clientId ];
-	}
-
-	// Retrieve root client ID to aid in retrieving relevant nested block
-	// order, being careful to allow the falsey empty string top-level root
-	// by explicitly testing against null.
-	const rootClientId = getBlockRootClientId( state, selectionStart.clientId );
-
-	if ( rootClientId === null ) {
-		return EMPTY_ARRAY;
-	}
-
-	const blockOrder = getBlockOrder( state, rootClientId );
-	const startIndex = blockOrder.indexOf( selectionStart.clientId );
-	const endIndex = blockOrder.indexOf( selectionEnd.clientId );
-
-	if ( startIndex > endIndex ) {
-		return blockOrder.slice( endIndex, startIndex + 1 );
-	}
-
-	return blockOrder.slice( startIndex, endIndex + 1 );
-}
-
 /**
  * Returns true if all of the descendants of a block with the given client ID
  * have an editing mode of 'disabled', or false otherwise.

packages/block-editor/src/store/selectors.js

@@ -30,11 +30,11 @@ import {
 	checkAllowListRecursive,
 	checkAllowList,
 	getAllPatternsDependants,
+	getSelectedBlockClientIdsUnmemoized,
 } from './utils';
 import { orderBy } from '../utils/sorting';
 import { STORE_NAME } from './constants';
 import { unlock } from '../lock-unlock';
-import { getSelectedBlockClientIdsUnmemoized } from './private-selectors';
 
 /**
  * A block selection object.

packages/block-editor/src/store/utils.js

@@ -1,3 +1,8 @@
+/**
+ * Internal dependencies
+ */
+import { getBlockRootClientId, getBlockOrder } from './selectors';
+
 export const checkAllowList = ( list, item, defaultResult = null ) => {
 	if ( typeof list === 'boolean' ) {
 		return list;
@@ -49,3 +54,36 @@ export const getAllPatternsDependants = ( state ) => {
 		state.blockPatterns,
 	];
 };
+
+const EMPTY_ARRAY = [];
+
+export function getSelectedBlockClientIdsUnmemoized( state ) {
+	const { selectionStart, selectionEnd } = state.selection;
+
+	if ( ! selectionStart.clientId || ! selectionEnd.clientId ) {
+		return EMPTY_ARRAY;
+	}
+
+	if ( selectionStart.clientId === selectionEnd.clientId ) {
+		return [ selectionStart.clientId ];
+	}
+
+	// Retrieve root client ID to aid in retrieving relevant nested block
+	// order, being careful to allow the falsey empty string top-level root
+	// by explicitly testing against null.
+	const rootClientId = getBlockRootClientId( state, selectionStart.clientId );
+
+	if ( rootClientId === null ) {
+		return EMPTY_ARRAY;
+	}
+
+	const blockOrder = getBlockOrder( state, rootClientId );
+	const startIndex = blockOrder.indexOf( selectionStart.clientId );
+	const endIndex = blockOrder.indexOf( selectionEnd.clientId );
+
+	if ( startIndex > endIndex ) {
+		return blockOrder.slice( endIndex, startIndex + 1 );
+	}
+
+	return blockOrder.slice( startIndex, endIndex + 1 );
+}