Test fixes

Author: sc0ttkclark

ui/js/dfv/src/store/test/actions.js

@@ -1,36 +1,17 @@
 import {
-	SAVE_STATUSES,
-	DUPLICATE_STATUSES,
-	DELETE_STATUSES,
-	UI_ACTIONS,
-	CURRENT_POD_ACTIONS,
+	SAVE_STATUSES, DUPLICATE_STATUSES, DELETE_STATUSES, UI_ACTIONS, CURRENT_POD_ACTIONS,
 } from '../constants';
 
 import {
 	// UI
-	setActiveTab,
-	setSaveStatus,
-	setDeleteStatus,
-	setGroupSaveStatus,
-	setGroupDuplicateStatus,
-	setGroupDeleteStatus,
-	// @todo add Field tests:
-	setFieldSaveStatus,
-	setFieldDeleteStatus,
+	setActiveTab, setSaveStatus, setDeleteStatus, setGroupSaveStatus, setGroupDuplicateStatus, setGroupDeleteStatus, // @todo add Field tests:
+	setFieldSaveStatus, setFieldDeleteStatus,
 
 	// Current Pod options
-	setPodName,
-	setOptionValue,
-	setOptionsValues,
-	moveGroup,
-	addGroup,
+	setPodName, setOptionValue, setOptionsValues, moveGroup, addGroup,
 
 	// API
-	savePod,
-	deletePod,
-	saveGroup,
-	duplicateGroup,
-	deleteGroup,
+	savePod, deletePod, saveGroup, duplicateGroup, deleteGroup,
 
 	// setGroupFields,
 	// addGroupField,
@@ -97,9 +78,7 @@ describe( 'actions', () => {
 				},
 			};
 
-			const result = setGroupSaveStatus(
-				SAVE_STATUSES.SAVE_SUCCESS,
-			)( {
+			const result = setGroupSaveStatus( SAVE_STATUSES.SAVE_SUCCESS )( {
 				message: 'Saved successfully.',
 			} );
 
@@ -109,15 +88,14 @@ describe( 'actions', () => {
 		test( 'setGroupDuplicateStatus() creates a function to create an action to change the group\'s duplicate status', () => {
 			const expected = {
 				type: UI_ACTIONS.SET_GROUP_DUPLICATE_STATUS,
-				saveStatus: DUPLICATE_STATUSES.DUPLICATE_SUCCESS,
+				duplicateStatus: DUPLICATE_STATUSES.DUPLICATE_SUCCESS,
+				name: 'new_group_name',
 				result: {
 					message: 'Duplicated successfully.',
 				},
 			};
 
-			const result = setGroupDuplicateStatus(
-				DUPLICATE_STATUSES.DUPLICATE_SUCCESS,
-			)( {
+			const result = setGroupDuplicateStatus( DUPLICATE_STATUSES.DUPLICATE_SUCCESS, 'new_group_name' )( {
 				message: 'Duplicated successfully.',
 			} );
 
@@ -133,9 +111,7 @@ describe( 'actions', () => {
 				},
 			};
 
-			const result = setGroupDeleteStatus(
-				DELETE_STATUSES.DELETING,
-			)( {
+			const result = setGroupDeleteStatus( DELETE_STATUSES.DELETING )( {
 				message: 'Deleted.',
 			} );
 
@@ -151,9 +127,7 @@ describe( 'actions', () => {
 				},
 			};
 
-			const result = setFieldSaveStatus(
-				SAVE_STATUSES.SAVE_SUCCESS,
-			)( {
+			const result = setFieldSaveStatus( SAVE_STATUSES.SAVE_SUCCESS )( {
 				message: 'Saved successfully.',
 			} );
 
@@ -169,9 +143,7 @@ describe( 'actions', () => {
 				},
 			};
 
-			const result = setFieldDeleteStatus(
-				DELETE_STATUSES.DELETING,
-			)( {
+			const result = setFieldDeleteStatus( DELETE_STATUSES.DELETING )( {
 				message: 'Deleted.',
 			} );
 
@@ -273,15 +245,12 @@ describe( 'actions', () => {
 				storage: 'test',
 				object_storage_type: 'collection',
 				type: 'post_type',
-				_locale: 'user',
-				// The following should be included.
+				_locale: 'user', // The following should be included.
 				label_add_new: 'Add New Something',
 				rest_enable: '0',
-				description: 'Test',
-				// Groups/fields will change into the "order" data.
+				description: 'Test', // Groups/fields will change into the "order" data.
 				groups: [
-					GROUP,
-					{
+					GROUP, {
 						...GROUP,
 						id: 123,
 						name: 'another-group',
@@ -306,8 +275,7 @@ describe( 'actions', () => {
 						{
 							group_id: 122,
 							fields: [ 119 ],
-						},
-						{
+						}, {
 							group_id: 123,
 							fields: [ 139 ],
 						},

ui/js/dfv/src/store/test/reducer.js

@@ -3,18 +3,11 @@ import deepFreeze from 'deep-freeze';
 import * as paths from '../state-paths';
 
 import {
-	SAVE_STATUSES,
-	DUPLICATE_STATUSES,
-	DELETE_STATUSES,
-	CURRENT_POD_ACTIONS,
-	UI_ACTIONS,
-	INITIAL_UI_STATE,
+	SAVE_STATUSES, DUPLICATE_STATUSES, DELETE_STATUSES, CURRENT_POD_ACTIONS, UI_ACTIONS, INITIAL_UI_STATE,
 } from '../constants';
 
 import {
-	ui,
-	currentPod,
-	global,
+	ui, currentPod, global,
 } from '../reducer';
 
 describe( 'UI reducer', () => {
@@ -60,9 +53,10 @@ describe( 'UI reducer', () => {
 		expect( newState.saveMessage ).toEqual( 'Saving...' );
 	} );
 
-	it( 'changes the duplicate status', () => {
+	it( 'changes the group duplicate status', () => {
 		const action = {
-			type: UI_ACTIONS.SET_DUPLICATE_STATUS,
+			type: UI_ACTIONS.SET_GROUP_DUPLICATE_STATUS,
+			name: 'group_abc',
 			duplicateStatus: DUPLICATE_STATUSES.DUPLICATING,
 			result: {
 				message: 'Duplicating...',
@@ -71,13 +65,13 @@ describe( 'UI reducer', () => {
 
 		const newState = ui( state, action );
 
-		expect( newState.duplicateStatus ).toEqual( action.duplicateStatus );
-		expect( newState.duplicateMessage ).toEqual( 'Duplicating...' );
+		expect( newState.groupDuplicateStatuses.group_abc ).toEqual( action.duplicateStatus );
+		expect( newState.groupDuplicateMessages.group_abc ).toEqual( 'Duplicating...' );
 	} );
 
-	it( 'uses the default for an unknown duplicate status', () => {
+	it( 'uses the default for an unknown group duplicate status', () => {
 		const action = {
-			type: UI_ACTIONS.SET_DUPLICATE_STATUS,
+			type: UI_ACTIONS.SET_GROUP_DUPLICATE_STATUS,
 			duplicateStatus: 'xyzzy',
 		};