Remove checks for store existance in withSelect HOCs for media compon…

…ents (#11903)
WordPress · Nov 15, 2018 · 5f44a42 · 5f44a42
1 parent db84d19
commit 5f44a42
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/packages/editor/src/components/media-placeholder/index.js b/packages/editor/src/components/media-placeholder/index.js
@@ -52,7 +52,7 @@ const InsertFromURLPopover = ( { src, onChange, onSubmit, onClose } ) => (
 	</URLPopover>
 );
 
-class MediaPlaceholder extends Component {
+export class MediaPlaceholder extends Component {
 	constructor() {
 		super( ...arguments );
 		this.state = {
@@ -258,13 +258,10 @@ class MediaPlaceholder extends Component {
 }
 
 const applyWithSelect = withSelect( ( select ) => {
-	let hasUploadPermissions = false;
-	if ( undefined !== select( 'core' ) ) {
-		hasUploadPermissions = select( 'core' ).hasUploadPermissions();
-	}
+	const { hasUploadPermissions } = select( 'core' );
 
 	return {
-		hasUploadPermissions: hasUploadPermissions,
+		hasUploadPermissions: hasUploadPermissions(),
 	};
 } );
 

diff --git a/packages/editor/src/components/media-placeholder/test/index.js b/packages/editor/src/components/media-placeholder/test/index.js
@@ -6,12 +6,14 @@ import { mount } from 'enzyme';
 /**
  * Internal dependencies
  */
-import MediaPlaceholder from '../';
+import { MediaPlaceholder } from '../';
+
+jest.mock( '../../media-upload/check', () => () => null );
 
 describe( 'MediaPlaceholder', () => {
 	it( 'renders successfully when allowedTypes property is not specified', () => {
 		expect( () => mount(
-			<MediaPlaceholder />
+			<MediaPlaceholder hasUploadPermissions={ false } />
 		) ).not.toThrow();
 	} );
 } );
diff --git a/packages/editor/src/components/media-upload/check.js b/packages/editor/src/components/media-upload/check.js
@@ -8,12 +8,9 @@ export function MediaUploadCheck( { hasUploadPermissions, fallback = null, child
 }
 
 export default withSelect( ( select ) => {
-	let hasUploadPermissions = false;
-	if ( undefined !== select( 'core' ) ) {
-		hasUploadPermissions = select( 'core' ).hasUploadPermissions();
-	}
+	const { hasUploadPermissions } = select( 'core' );
 
 	return {
-		hasUploadPermissions: hasUploadPermissions,
+		hasUploadPermissions: hasUploadPermissions(),
 	};
 } )( MediaUploadCheck );