Merge d88fe54 into 3e6102e

assets/src/media-selector/helpers/unset-unsplash-library.js → assets/src/media-selector/controllers/unset-unsplash-library.js

@@ -1,8 +1,7 @@
 /**
  * Internal dependencies
  */
-import isApplicableLibraries from './is-applicable-libraries';
-import isImageIncluded from './is-image-included';
+import { isApplicableLibraries, isImageIncluded } from '../helpers';
 
 const { setUserSetting, getUserSetting } = window;
 

assets/src/media-selector/helpers/import-images.js

@@ -6,9 +6,9 @@ import { addQueryArgs } from '@wordpress/url';
 /**
  * Internal dependencies
  */
-import isUnsplashImage from './is-unsplash-image';
-import getConfig from './get-config';
-import preloadImage from './preload-image';
+import { getConfig, isUnsplashImage, preloadImage } from './';
+
+const { getUserSetting } = window;
 
 /**
  * Import selected Unsplash images.
@@ -108,8 +108,7 @@ const processImage = options => {
  */
 const preloadImageWp = image => {
 	const defaultProps = wp.media.view.settings.defaultProps;
-	const imageSize =
-		window.getUserSetting( 'imgsize', defaultProps.size ) || 'medium';
+	const imageSize = getUserSetting( 'imgsize', defaultProps.size ) || 'medium';
 	const { sizes } = image.attributes;
 	if ( sizes && sizes[ imageSize ] && sizes[ imageSize ].url ) {
 		return preloadImage( sizes[ imageSize ].url );

assets/src/media-selector/helpers/index.js

@@ -0,0 +1,6 @@
+export { default as getConfig } from './get-config';
+export { default as importImages } from './import-images';
+export { default as isApplicableLibraries } from './is-applicable-libraries';
+export { default as isImageIncluded } from './is-image-included';
+export { default as isUnsplashImage } from './is-unsplash-image';
+export { default as preloadImage } from './preload-image';

assets/src/media-selector/index.js

@@ -2,9 +2,8 @@
  * Internal dependencies
  */
 import './style.css';
-import withUnsplashTab from './helpers/with-unsplash-tab';
-import unsetUnsplashLibrary from './helpers/unset-unsplash-library';
-import PostFrame from './views/post-frame';
+import unsetUnsplashLibrary from './controllers/unset-unsplash-library';
+import { withUnsplashTab, PostFrame } from './views';
 
 // Override media frames in the respective editors to add the Unsplash tab.
 if ( wp.media && wp.media.view && wp.media.view.MediaFrame ) {

assets/src/media-selector/models/images-query-model.js

@@ -7,8 +7,7 @@ import { addQueryArgs } from '@wordpress/url';
  * Internal dependencies
  */
 import ImagesCollection from '../collections/images-collection';
-import getConfig from '../helpers/get-config';
-import preloadImage from '../helpers/preload-image';
+import { preloadImage, getConfig } from '../helpers';
 
 const ImagesQueryModel = wp.media.model.Query.extend(
 	{

assets/src/media-selector/store/unsplash-state.js

@@ -2,7 +2,7 @@
  * Internal dependencies
  */
 import ImagesCollection from '../collections/images-collection';
-import getConfig from '../helpers/get-config';
+import { getConfig } from '../helpers';
 
 const State = wp.media.controller.State;
 

assets/src/media-selector/views/button.js

@@ -1,8 +1,7 @@
 /**
  * Internal dependencies
  */
-import isUnsplashImage from '../helpers/is-unsplash-image';
-import importImages from '../helpers/import-images';
+import { importImages, isUnsplashImage } from '../helpers';
 
 const Button = wp.media.view.Button.extend( {
 	/**

assets/src/media-selector/views/images-browser.js

@@ -1,8 +1,8 @@
 /**
  * Internal dependencies
  */
-import ImageViews from './image-views';
-import getConfig from '../helpers/get-config';
+import { ImageViews } from './';
+import { getConfig } from '../helpers';
 
 const ImagesBrowser = wp.media.view.AttachmentsBrowser.extend( {
 	className: 'unsplash-browser attachments-browser',

assets/src/media-selector/views/index.js

@@ -0,0 +1,8 @@
+export { default as Button } from './button';
+export { default as ImagesBrowser } from './images-browser';
+export { default as ImageView } from './image-view';
+export { default as ImageViews } from './image-views';
+export { default as PostFrame } from './post-frame';
+export { default as Toolbar } from './toolbar';
+export { default as ToolbarSelect } from './toolbar-select';
+export { default as withUnsplashTab } from './with-unsplash-tab';

assets/src/media-selector/views/toolbar-select.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import Toolbar from './toolbar';
+import { Toolbar } from './';
 
 const ToolbarSelect = wp.media.view.Toolbar.Select.extend( {
 	initialize() {

assets/src/media-selector/views/toolbar.js

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import Button from './button';
+import { Button } from './';
 
 const Toolbar = wp.media.view.Toolbar.extend( {
 	initialize() {

assets/src/media-selector/helpers/with-unsplash-tab.js → assets/src/media-selector/views/with-unsplash-tab.js

@@ -2,13 +2,8 @@
  * Internal dependencies
  */
 import UnsplashState from '../store/unsplash-state';
-import ImagesBrowser from '../views/images-browser';
-import ImageView from '../views/image-view';
-import Toolbar from '../views/toolbar';
-import ToolbarSelect from '../views/toolbar-select';
-import getConfig from './get-config';
-import isImageIncluded from './is-image-included';
-import isApplicableLibraries from './is-applicable-libraries';
+import { ImagesBrowser, ImageView, Toolbar, ToolbarSelect } from './';
+import { getConfig, isApplicableLibraries, isImageIncluded } from '../helpers';
 
 export default View => {
 	return View.extend( {

tests/js/media-selector/helpers/get-config.spec.js

@@ -0,0 +1,32 @@
+/**
+ * Internal dependencies
+ */
+import { getConfig } from '../../../../assets/src/media-selector/helpers';
+
+describe( 'get-config', () => {
+	beforeEach( () => {
+		// Delete the existing
+		delete window.unsplash;
+		window.unsplash = {
+			test: '123',
+		};
+	} );
+
+	afterAll( () => {
+		// Delete the existing
+		delete window.unsplash;
+	} );
+
+	it( 'check key', () => {
+		expect( getConfig( 'test' ) ).toBe( '123' );
+	} );
+
+	it( 'invalid key', () => {
+		expect( getConfig( 'wordpress' ) ).toBeUndefined();
+	} );
+
+	it( 'not set on window', () => {
+		delete window.unsplash;
+		expect( getConfig( 'wordpress' ) ).toBeUndefined();
+	} );
+} );

tests/js/media-selector/helpers/is-applicable-libraries.spec.js

@@ -0,0 +1,14 @@
+/**
+ * Internal dependencies
+ */
+import { isApplicableLibraries } from '../../../../assets/src/media-selector/helpers';
+
+describe( 'is-applicable-libraries', () => {
+	it( 'check string of video', () => {
+		expect( isApplicableLibraries( 'video' ) ).toBe( false );
+	} );
+
+	it( 'check string of library', () => {
+		expect( isApplicableLibraries( 'library' ) ).toBe( true );
+	} );
+} );

tests/js/media-selector/helpers/is-image-included.spec.js

@@ -0,0 +1,22 @@
+/**
+ * Internal dependencies
+ */
+import { isImageIncluded } from '../../../../assets/src/media-selector/helpers';
+
+describe( 'is-image-included', () => {
+	it( 'check empty array', () => {
+		expect( isImageIncluded( [] ) ).toBe( false );
+	} );
+
+	it( 'check with video array', () => {
+		expect( isImageIncluded( [ 'video' ] ) ).toBe( false );
+	} );
+
+	it( 'check array with image', () => {
+		expect( isImageIncluded( [ 'image' ] ) ).toBe( true );
+	} );
+
+	it( 'check string of image', () => {
+		expect( isImageIncluded( 'image' ) ).toBe( true );
+	} );
+} );

tests/js/media-selector/helpers/is-unsplash-image.spec.js

@@ -0,0 +1,33 @@
+/**
+ * Internal dependencies
+ */
+import { isUnsplashImage } from '../../../../assets/src/media-selector/helpers';
+
+describe( 'is-unsplash-image', () => {
+	it( 'valid attachment', () => {
+		const attachment = {
+			attributes: {
+				unsplash_order: 2,
+				id: 'fsfds',
+			},
+		};
+		expect( isUnsplashImage( attachment ) ).toBe( true );
+	} );
+	it( 'invalid attachment', () => {
+		const attachment = {
+			attributes: {
+				unsplash_order: 2,
+				id: 22,
+			},
+		};
+		expect( isUnsplashImage( attachment ) ).toBe( false );
+	} );
+	it( 'no order attachment', () => {
+		const attachment = {
+			attributes: {
+				id: 22,
+			},
+		};
+		expect( isUnsplashImage( attachment ) ).toBe( false );
+	} );
+} );