toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

MM-20149 Fix marking channels as read (#3549)

Browse source 
* MM-20149 Fix marking channels as read

* empty commit
This commit is contained in:
Elias Nahum 2019-11-13 13:38:20 -05:00 committed by GitHub
parent e5e3bcc844
commit dc830c56be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/actions/views/channel.js
View file

@ -392,10 +392,10 @@ export function handleSelectChannel(channelId, fromPushNotification = false) {
setChannelLoading(false),
setLastChannelForTeam(currentTeamId, channelId),
selectChannelWithMember(channelId, channel, member),
markChannelViewedAndRead(channelId, previousChannelId),
];
dispatch(batchActions(actions));
dispatch(markChannelViewedAndRead(channelId, previousChannelId));
};
}

14
app/actions/views/channel.test.js
View file

@ -17,12 +17,15 @@ const {
import postReducer from 'mattermost-redux/reducers/entities/posts';
const MOCK_CHANNEL_MARK_AS_READ = 'MOCK_CHANNEL_MARK_AS_READ';
const MOCK_CHANNEL_MARK_AS_VIEWED = 'MOCK_CHANNEL_MARK_AS_VIEWED';
jest.mock('mattermost-redux/actions/channels', () => {
const channelActions = require.requireActual('mattermost-redux/actions/channels');
return {
...channelActions,
markChannelAsRead: jest.fn().mockReturnValue({type: ''}),
markChannelAsViewed: jest.fn().mockReturnValue({type: ''}),
markChannelAsRead: jest.fn().mockReturnValue({type: 'MOCK_CHANNEL_MARK_AS_READ'}),
markChannelAsViewed: jest.fn().mockReturnValue({type: 'MOCK_CHANNEL_MARK_AS_VIEWED'}),
};
});
@ -251,8 +254,11 @@ describe('Actions.Views.Channel', () => {
store = mockStore({...storeObj});
await store.dispatch(handleSelectChannel(channelId, fromPushNotification));
const storeBatchActions = store.getActions().find(({type}) => type === 'BATCHING_REDUCER.BATCH');
const storeActions = store.getActions();
const storeBatchActions = storeActions.find(({type}) => type === 'BATCHING_REDUCER.BATCH');
const selectChannelWithMember = storeBatchActions.payload.find(({type}) => type === ViewTypes.SELECT_CHANNEL_WITH_MEMBER);
const viewedAction = storeActions.find(({type}) => type === MOCK_CHANNEL_MARK_AS_VIEWED);
const readAction = storeActions.find(({type}) => type === MOCK_CHANNEL_MARK_AS_READ);
const expectedSelectChannelWithMember = {
type: ViewTypes.SELECT_CHANNEL_WITH_MEMBER,
@ -268,5 +274,7 @@ describe('Actions.Views.Channel', () => {
};
expect(selectChannelWithMember).toStrictEqual(expectedSelectChannelWithMember);
expect(viewedAction).not.toBe(null);
expect(readAction).not.toBe(null);
});
});