therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'eslint-fix'

Browse source 
# Conflicts:
#   src/components/post_status_form/post_status_form.vue
This commit is contained in:
HJ 2019-07-06 20:43:38 +00:00
commit 8f53796420
6 changed files with 63 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/unit/specs/modules/statuses.spec.js
View file

@ -258,11 +258,11 @@ describe('Statuses module', () => {
})
describe('clearTimeline', () => {
it('keeps userId when clearing user timeline', () => {
it('keeps userId when clearing user timeline when excludeUserId param is true', () => {
const state = defaultState()
state.timelines.user.userId = 123
mutations.clearTimeline(state, { timeline: 'user' })
mutations.clearTimeline(state, { timeline: 'user', excludeUserId: true })
expect(state.timelines.user.userId).to.eql(123)
})