Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make preferences reducer deterministic #5423

Merged
merged 1 commit into from
Mar 8, 2018
Merged

Make preferences reducer deterministic #5423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions editor/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ export function replaceBlocks( uids, blocks ) {
type: 'REPLACE_BLOCKS',
uids: castArray( uids ),
blocks: castArray( blocks ),
time: Date.now(),
};
}

Expand Down Expand Up @@ -213,6 +214,7 @@ export function insertBlocks( blocks, index, rootUID ) {
blocks: castArray( blocks ),
index,
rootUID,
time: Date.now(),
};
}

Expand Down
2 changes: 1 addition & 1 deletion editor/store/reducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ export function preferences( state = PREFERENCES_DEFAULTS, action ) {
insertUsage: {
...prevState.insertUsage,
[ id ]: {
time: Date.now(),
time: action.time,
count: prevState.insertUsage[ id ] ? prevState.insertUsage[ id ].count + 1 : 1,
insert,
},
Expand Down
10 changes: 8 additions & 2 deletions editor/store/test/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ describe( 'actions', () => {
type: 'REPLACE_BLOCKS',
uids: [ 'chicken' ],
blocks: [ block ],
time: expect.any( Number ),
} );
} );
} );
Expand All @@ -177,6 +178,7 @@ describe( 'actions', () => {
type: 'REPLACE_BLOCKS',
uids: [ 'chicken' ],
blocks,
time: expect.any( Number ),
} );
} );
} );
Expand All @@ -187,10 +189,12 @@ describe( 'actions', () => {
uid: 'ribs',
};
const index = 5;
expect( insertBlock( block, index ) ).toEqual( {
expect( insertBlock( block, index, 'test_uid' ) ).toEqual( {
type: 'INSERT_BLOCKS',
blocks: [ block ],
index,
rootUID: 'test_uid',
time: expect.any( Number ),
} );
} );
} );
Expand All @@ -201,10 +205,12 @@ describe( 'actions', () => {
uid: 'ribs',
} ];
const index = 3;
expect( insertBlocks( blocks, index ) ).toEqual( {
expect( insertBlocks( blocks, index, 'test_uid' ) ).toEqual( {
type: 'INSERT_BLOCKS',
blocks,
index,
rootUID: 'test_uid',
time: expect.any( Number ),
} );
} );
} );
Expand Down
22 changes: 13 additions & 9 deletions editor/store/test/effects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,14 @@ describe( 'effects', () => {

expect( dispatch ).toHaveBeenCalledTimes( 2 );
expect( dispatch ).toHaveBeenCalledWith( selectBlock( 'chicken', -1 ) );
expect( dispatch ).toHaveBeenCalledWith( replaceBlocks( [ 'chicken', 'ribs' ], [ {
uid: 'chicken',
name: 'core/test-block',
attributes: { content: 'chicken ribs' },
} ] ) );
expect( dispatch ).toHaveBeenCalledWith( {
...replaceBlocks( [ 'chicken', 'ribs' ], [ {
uid: 'chicken',
name: 'core/test-block',
attributes: { content: 'chicken ribs' },
} ] ),
time: expect.any( Number ),
} );
} );

it( 'should not merge the blocks have different types without transformation', () => {
Expand Down Expand Up @@ -780,12 +783,13 @@ describe( 'effects', () => {
expect( dispatch ).toHaveBeenCalledWith(
saveReusableBlock( expect.any( Number ) )
);
expect( dispatch ).toHaveBeenCalledWith(
replaceBlocks(
expect( dispatch ).toHaveBeenCalledWith( {
...replaceBlocks(
[ staticBlock.uid ],
[ createBlock( 'core/block', { ref: expect.any( Number ) } ) ]
)
);
),
time: expect.any( Number ),
} );
} );
} );
} );
Expand Down
10 changes: 6 additions & 4 deletions editor/store/test/reducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,12 +1207,13 @@ describe( 'state', () => {
uid: 'bacon',
name: 'core-embed/twitter',
} ],
time: 123456,
} );

expect( state ).toEqual( {
insertUsage: {
'core-embed/twitter': {
time: expect.any( Number ),
time: 123456,
count: 1,
insert: { name: 'core-embed/twitter' },
},
Expand All @@ -1222,7 +1223,7 @@ describe( 'state', () => {
const twoRecentBlocks = preferences( deepFreeze( {
insertUsage: {
'core-embed/twitter': {
time: expect.any( Number ),
time: 123456,
count: 1,
insert: { name: 'core-embed/twitter' },
},
Expand All @@ -1237,17 +1238,18 @@ describe( 'state', () => {
name: 'core/block',
attributes: { ref: 123 },
} ],
time: 123457,
} );

expect( twoRecentBlocks ).toEqual( {
insertUsage: {
'core-embed/twitter': {
time: expect.any( Number ),
time: 123457,
count: 2,
insert: { name: 'core-embed/twitter' },
},
'core/block/123': {
time: expect.any( Number ),
time: 123457,
count: 1,
insert: { name: 'core/block', ref: 123 },
},
Expand Down