remove use of generatorActions default import ans switch to dispatch …

…control for autosave
WordPress · Feb 28, 2019 · 4cc4015 · 4cc4015
1 parent 1c11a5b
commit 4cc4015
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/packages/editor/src/store/actions.js b/packages/editor/src/store/actions.js
@@ -472,7 +472,11 @@ export function* trashPost() {
  * @param {Object?} options Extra flags to identify the autosave.
  */
 export function* autosave( options ) {
-	yield* generatorActions.savePost( { isAutosave: true, ...options } );
+	yield dispatch(
+		STORE_KEY,
+		'savePost',
+		{ isAutosave: true, ...options }
+	);
 }
 
 /**
@@ -734,12 +738,3 @@ export const exitFormattedText = getBlockEditorAction( 'exitFormattedText' );
 export const insertDefaultBlock = getBlockEditorAction( 'insertDefaultBlock' );
 export const updateBlockListSettings = getBlockEditorAction( 'updateBlockListSettings' );
 export const updateEditorSettings = getBlockEditorAction( 'updateEditorSettings' );
-
-// default export of generator actions.
-const generatorActions = {
-	savePost,
-	autosave,
-	trashPost,
-	refreshPost,
-};
-export default generatorActions;
diff --git a/packages/editor/src/store/test/actions.js b/packages/editor/src/store/test/actions.js
@@ -6,7 +6,7 @@ import { BEGIN, COMMIT, REVERT } from 'redux-optimist';
 /**
  * Internal dependencies
  */
-import generatorActions, * as actions from '../actions';
+import * as actions from '../actions';
 import { select, dispatch, apiFetch, resolveSelect } from '../controls';
 import {
 	STORE_KEY,
@@ -491,15 +491,11 @@ describe( 'Post generator actions', () => {
 		} );
 	} );
 	describe( 'autosave()', () => {
-		let savePostSpy;
-		beforeAll( () => savePostSpy = jest.spyOn( generatorActions, 'savePost' ) );
-		afterAll( () => savePostSpy.mockRestore() );
-		// autosave is mostly covered by `savePost` tests so just test the correct call
-		it( 'calls savePost with the correct arguments', () => {
+		it( 'dispatches savePost with the correct arguments', () => {
 			const fulfillment = actions.autosave();
-			fulfillment.next();
-			expect( savePostSpy ).toHaveBeenCalled();
-			expect( savePostSpy ).toHaveBeenCalledWith( { isAutosave: true } );
+			const { value } = fulfillment.next();
+			expect( value.actionName ).toBe( 'savePost' );
+			expect( value.args ).toEqual( [ { isAutosave: true } ] );
 		} );
 	} );
 	describe( 'trashPost()', () => {