Skip to content

Commit

Permalink
Merge branch 'feature/simplify'
Browse files Browse the repository at this point in the history
  • Loading branch information
Filip committed May 2, 2020
2 parents 688d497 + d623531 commit 9db4b36
Show file tree
Hide file tree
Showing 22 changed files with 66 additions and 65 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ jest tests/unit/Home.spec.js
- message is showed after button click and hide on @hideMessage event
5. Actions
- doReservation commits to mutation
- exampleApiAction makes commit based on API response
6. Mutations
- addMeeting push item to state.meetingList
7. Getters
Expand Down
8 changes: 4 additions & 4 deletions done/src/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ export const actions = {
doReservation ({ commit }, data) {
commit('addMeeting', data)
},
async fakeApiAction ({ commit }, data) {
async exampleApiAction ({ commit }, data) {
try {
await axios.post('http://localhost:5679/fake/confirmMeeting', data)
commit('fakeCommit', true)
await axios.post('http://localhost:5679/example/confirmMeeting', data)
commit('exampleCommit', true)
}
catch (error) {
commit('fakeCommit', false)
commit('exampleCommit', false)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import flushPromises from 'flush-promises'

jest.mock('axios')

describe('actions - store', () => {
describe('store/actions', () => {
beforeEach(() => {
axios.post.mockClear()
})
Expand All @@ -20,26 +20,26 @@ describe('actions - store', () => {
expect(context.commit).toHaveBeenCalledWith('addMeeting', testItem)
})

it('fakeApiAction makes commit based on API response', async () => {
it('exampleApiAction makes commit based on API response', async () => {
const context = {
commit: jest.fn()
}
const testItem = { 'test': true }

actions.fakeApiAction(context, testItem)
actions.exampleApiAction(context, testItem)

await flushPromises()

expect(axios.post).toHaveBeenCalledWith('http://localhost:5679/fake/confirmMeeting', testItem)
expect(axios.post).toHaveBeenCalledWith('http://localhost:5679/example/confirmMeeting', testItem)
expect(axios.post).toHaveBeenCalledTimes(1)
expect(context.commit).toHaveBeenCalledWith('fakeCommit', true)
expect(context.commit).toHaveBeenCalledWith('exampleCommit', true)

axios.post.mockImplementationOnce(() => {
throw 'error'
})
actions.fakeApiAction(context)
actions.exampleApiAction(context)

expect(axios.post).toHaveBeenCalledTimes(2)
expect(context.commit).toHaveBeenCalledWith('fakeCommit', false)
expect(context.commit).toHaveBeenCalledWith('exampleCommit', false)
})
})
2 changes: 1 addition & 1 deletion done/tests/unit/AddMeeting.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jest.mock('axios')
// Check for more: https://jestjs.io/docs/en/timer-mocks
jest.useFakeTimers()

describe('AddMeeting page', () => {
describe('views/AddMeeting.vue', () => {
let present
let next

Expand Down
2 changes: 1 addition & 1 deletion done/tests/unit/Checkbox.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const propsData = {
value: false
}

describe('Checkbox.vue', () => {
describe('components/Checkbox.vue', () => {
it('emit events when change checked value', () => {
const wrapper = createWrapper(Checkbox, { propsData })

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getters } from '@/store'
import { advanceTo, clear } from 'jest-date-mock'

describe('getters - store', () => {
describe('store/getters', () => {
beforeEach(() => {
advanceTo(new Date('2020-03-27T00:00:05Z'))
})
Expand Down
2 changes: 1 addition & 1 deletion done/tests/unit/Home.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createWrapper, createStore } from '../factory'
import HomePage from '@/views/Home.vue'

describe('Home page', () => {
describe('views/Home.vue', () => {
it('meeting list contains elements from store', () => {
const localStore = createStore({ state: {
meetingList: [
Expand Down
2 changes: 1 addition & 1 deletion done/tests/unit/Message.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const propsData = {
isMessageShowed: false
}

describe('Message.vue', () => {
describe('components/Message.vue', () => {
it('renders prop title when passed', () => {
const wrapper = createWrapper(Message, { propsData })

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { mutations } from '@/store'

describe('mutations - store', () => {
describe('store/mutations', () => {
it('addMeeting push item to state.meetingList', () => {
const newElement = {
'date': '2020-03-27',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ localVue.use(Vuex)

jest.mock('axios')

describe('vuex store instance', () => {
describe('Vuex store instance', () => {
let store
let storeConfig

Expand All @@ -19,21 +19,21 @@ describe('vuex store instance', () => {
addMeeting (state, data) {
state.meetingList.push(data)
},
fakeCommit () {
exampleCommit () {
return true
}
},
actions: {
doReservation ({ commit }, data) {
commit('addMeeting', data)
},
async fakeApiAction ({ commit }, data) {
async exampleApiAction ({ commit }, data) {
try {
await axios.post('http://localhost:5679/fake/confirmMeeting', data)
commit('fakeCommit', true)
await axios.post('http://localhost:5679/example/confirmMeeting', data)
commit('exampleCommit', true)
}
catch (error) {
commit('fakeCommit', false)
commit('exampleCommit', false)
}
}
},
Expand Down Expand Up @@ -62,20 +62,20 @@ describe('vuex store instance', () => {
expect(store.state.meetingList).toStrictEqual([testElement, testElement])
})

it('dispatching fakeApiAction doing mocked request', async () => {
it('dispatching exampleApiAction doing mocked request', async () => {
const testItem = { 'test': true }

store.dispatch('fakeApiAction', testItem)
store.dispatch('exampleApiAction', testItem)

await flushPromises()

expect(axios.post).toHaveBeenCalledWith('http://localhost:5679/fake/confirmMeeting', testItem)
expect(axios.post).toHaveBeenCalledWith('http://localhost:5679/example/confirmMeeting', testItem)
expect(axios.post).toHaveBeenCalledTimes(1)

axios.post.mockImplementationOnce(() => {
throw 'error'
})
store.dispatch('fakeApiAction', testItem)
store.dispatch('exampleApiAction', testItem)

expect(axios.post).toHaveBeenCalledTimes(2)
})
Expand Down
40 changes: 20 additions & 20 deletions done/tests/unit/__snapshots__/AddMeeting.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`AddMeeting page button can be disable or enabled 1`] = `
exports[`views/AddMeeting.vue button can be disable or enabled 1`] = `
<div class="add-meeting">
<div class="add-meeting__container">
<h1>Add meeting</h1>
Expand Down Expand Up @@ -42,7 +42,7 @@ exports[`AddMeeting page button can be disable or enabled 1`] = `
</div>
`;
exports[`AddMeeting page button can be disable or enabled 2`] = `
exports[`views/AddMeeting.vue button can be disable or enabled 2`] = `
"Snapshot Diff:
- First value
+ Second value
Expand All @@ -68,7 +68,7 @@ exports[`AddMeeting page button can be disable or enabled 2`] = `
"
`;
exports[`AddMeeting page can add meeting to store 1`] = `
exports[`views/AddMeeting.vue can add meeting to store 1`] = `
<div class="add-meeting add-meeting--loading">
<div class="add-meeting__container">
<h1>Add meeting</h1>
Expand Down Expand Up @@ -101,7 +101,7 @@ exports[`AddMeeting page can add meeting to store 1`] = `
</div>
`;
exports[`AddMeeting page can add meeting to store 2`] = `
exports[`views/AddMeeting.vue can add meeting to store 2`] = `
"Snapshot Diff:
- First value
+ Second value
Expand Down Expand Up @@ -140,7 +140,7 @@ exports[`AddMeeting page can add meeting to store 2`] = `
"
`;
exports[`AddMeeting page can add meeting to store 3`] = `
exports[`views/AddMeeting.vue can add meeting to store 3`] = `
"Snapshot Diff:
- First value
+ Second value
Expand Down Expand Up @@ -171,7 +171,7 @@ exports[`AddMeeting page can add meeting to store 3`] = `
</div>"
`;
exports[`AddMeeting page can set custom meeting day in form 1`] = `
exports[`views/AddMeeting.vue can set custom meeting day in form 1`] = `
<div class="add-meeting">
<div class="add-meeting__container">
<h1>Add meeting</h1>
Expand Down Expand Up @@ -213,12 +213,12 @@ exports[`AddMeeting page can set custom meeting day in form 1`] = `
</div>
`;
exports[`AddMeeting page can set custom meeting day in form 2`] = `
exports[`views/AddMeeting.vue can set custom meeting day in form 2`] = `
"Snapshot Diff:
Compared values have no visual difference."
`;
exports[`AddMeeting page default form is rendered 1`] = `
exports[`views/AddMeeting.vue default form is rendered 1`] = `
<div class="add-meeting add-meeting--loading">
<div class="add-meeting__container">
<h1>Add meeting</h1>
Expand Down Expand Up @@ -251,7 +251,7 @@ exports[`AddMeeting page default form is rendered 1`] = `
</div>
`;
exports[`AddMeeting page error is showed when form is invalid 1`] = `
exports[`views/AddMeeting.vue error is showed when form is invalid 1`] = `
<div class="add-meeting add-meeting--loading">
<div class="add-meeting__container">
<h1>Add meeting</h1>
Expand Down Expand Up @@ -284,7 +284,7 @@ exports[`AddMeeting page error is showed when form is invalid 1`] = `
</div>
`;
exports[`AddMeeting page error is showed when form is invalid 2`] = `
exports[`views/AddMeeting.vue error is showed when form is invalid 2`] = `
"Snapshot Diff:
- First value
+ Second value
Expand All @@ -306,7 +306,7 @@ exports[`AddMeeting page error is showed when form is invalid 2`] = `
"
`;
exports[`AddMeeting page has loading class when form is blocked 1`] = `
exports[`views/AddMeeting.vue has loading class when form is blocked 1`] = `
<div class="add-meeting add-meeting--loading">
<div class="add-meeting__container">
<h1>Add meeting</h1>
Expand Down Expand Up @@ -339,7 +339,7 @@ exports[`AddMeeting page has loading class when form is blocked 1`] = `
</div>
`;
exports[`AddMeeting page has loading class when form is blocked 2`] = `
exports[`views/AddMeeting.vue has loading class when form is blocked 2`] = `
"Snapshot Diff:
- First value
+ Second value
Expand Down Expand Up @@ -370,7 +370,7 @@ exports[`AddMeeting page has loading class when form is blocked 2`] = `
</div>"
`;
exports[`AddMeeting page predefined addreses are available 1`] = `
exports[`views/AddMeeting.vue predefined addreses are available 1`] = `
<div class="add-meeting add-meeting--loading">
<div class="add-meeting__container">
<h1>Add meeting</h1>
Expand Down Expand Up @@ -403,7 +403,7 @@ exports[`AddMeeting page predefined addreses are available 1`] = `
</div>
`;
exports[`AddMeeting page predefined addreses are available 2`] = `
exports[`views/AddMeeting.vue predefined addreses are available 2`] = `
"Snapshot Diff:
- First value
+ Second value
Expand Down Expand Up @@ -434,7 +434,7 @@ exports[`AddMeeting page predefined addreses are available 2`] = `
</div>"
`;
exports[`AddMeeting page predefined checkbox toggle fields and clear values 1`] = `
exports[`views/AddMeeting.vue predefined checkbox toggle fields and clear values 1`] = `
<div class="add-meeting">
<div class="add-meeting__container">
<h1>Add meeting</h1>
Expand Down Expand Up @@ -476,7 +476,7 @@ exports[`AddMeeting page predefined checkbox toggle fields and clear values 1`]
</div>
`;
exports[`AddMeeting page predefined checkbox toggle fields and clear values 2`] = `
exports[`views/AddMeeting.vue predefined checkbox toggle fields and clear values 2`] = `
"Snapshot Diff:
- First value
+ Second value
Expand Down Expand Up @@ -507,12 +507,12 @@ exports[`AddMeeting page predefined checkbox toggle fields and clear values 2`]
<div class=\\"add-meeting__wrapper\\"><label for=\\"meetingDate\\">"
`;
exports[`AddMeeting page predefined checkbox toggle fields and clear values 3`] = `
exports[`views/AddMeeting.vue predefined checkbox toggle fields and clear values 3`] = `
"Snapshot Diff:
Compared values have no visual difference."
`;
exports[`AddMeeting page predefined checkbox toggle fields and clear values 4`] = `
exports[`views/AddMeeting.vue predefined checkbox toggle fields and clear values 4`] = `
"Snapshot Diff:
- First value
+ Second value
Expand Down Expand Up @@ -543,7 +543,7 @@ exports[`AddMeeting page predefined checkbox toggle fields and clear values 4`]
<div class=\\"add-meeting__wrapper\\"><label for=\\"meetingDate\\">"
`;
exports[`AddMeeting page predefined select change value to selected option 1`] = `
exports[`views/AddMeeting.vue predefined select change value to selected option 1`] = `
<div class="add-meeting">
<div class="add-meeting__container">
<h1>Add meeting</h1>
Expand Down Expand Up @@ -585,7 +585,7 @@ exports[`AddMeeting page predefined select change value to selected option 1`] =
</div>
`;
exports[`AddMeeting page predefined select change value to selected option 2`] = `
exports[`views/AddMeeting.vue predefined select change value to selected option 2`] = `
"Snapshot Diff:
Compared values have no visual difference."
`;
2 changes: 1 addition & 1 deletion done/tests/unit/__snapshots__/Checkbox.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Checkbox.vue default component matches snapshot 1`] = `
exports[`components/Checkbox.vue default component matches snapshot 1`] = `
<div class="checkbox"><label for="checkbox1">
label prop
</label> <input id="checkbox1" type="checkbox"></div>
Expand Down
2 changes: 1 addition & 1 deletion done/tests/unit/__snapshots__/Home.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Home page meeting list contains elements from store 1`] = `
exports[`views/Home.vue meeting list contains elements from store 1`] = `
<div class="home">
<div class="home__list">
<div class="home__item">
Expand Down
2 changes: 1 addition & 1 deletion done/tests/unit/__snapshots__/Message.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Message.vue default component matches snapshot 1`] = `
exports[`components/Message.vue default component matches snapshot 1`] = `
<div class="message">
<h2>
test title
Expand Down
9 changes: 9 additions & 0 deletions practices/tests/unit/Actions.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { actions } from '@/store'

describe('store/actions', () => {
// it('doReservation commits to mutation', () => {
// })

// it('exampleApiAction makes commit based on API response', async () => {
// })
})
2 changes: 1 addition & 1 deletion practices/tests/unit/AddMeeting.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jest.mock('axios')
// Check for more: https://jestjs.io/docs/en/timer-mocks
jest.useFakeTimers()

describe('AddMeeting page', () => {
describe('views/AddMeeting.vue', () => {
beforeEach(() => {
})

Expand Down
Loading

0 comments on commit 9db4b36

Please sign in to comment.