Skip to content

Commit 9db4b36

Browse files
author
Filip
committed
Merge branch 'feature/simplify'
2 parents 688d497 + d623531 commit 9db4b36

22 files changed

+66
-65
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ jest tests/unit/Home.spec.js
8787
- message is showed after button click and hide on @hideMessage event
8888
5. Actions
8989
- doReservation commits to mutation
90+
- exampleApiAction makes commit based on API response
9091
6. Mutations
9192
- addMeeting push item to state.meetingList
9293
7. Getters

‎done/src/store/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ export const actions = {
1818
doReservation ({ commit }, data) {
1919
commit('addMeeting', data)
2020
},
21-
async fakeApiAction ({ commit }, data) {
21+
async exampleApiAction ({ commit }, data) {
2222
try {
23-
await axios.post('http://localhost:5679/fake/confirmMeeting', data)
24-
commit('fakeCommit', true)
23+
await axios.post('http://localhost:5679/example/confirmMeeting', data)
24+
commit('exampleCommit', true)
2525
}
2626
catch (error) {
27-
commit('fakeCommit', false)
27+
commit('exampleCommit', false)
2828
}
2929
}
3030
}

‎done/tests/unit/actions.spec.js renamed to ‎done/tests/unit/Actions.spec.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import flushPromises from 'flush-promises'
44

55
jest.mock('axios')
66

7-
describe('actions - store', () => {
7+
describe('store/actions', () => {
88
beforeEach(() => {
99
axios.post.mockClear()
1010
})
@@ -20,26 +20,26 @@ describe('actions - store', () => {
2020
expect(context.commit).toHaveBeenCalledWith('addMeeting', testItem)
2121
})
2222

23-
it('fakeApiAction makes commit based on API response', async () => {
23+
it('exampleApiAction makes commit based on API response', async () => {
2424
const context = {
2525
commit: jest.fn()
2626
}
2727
const testItem = { 'test': true }
2828

29-
actions.fakeApiAction(context, testItem)
29+
actions.exampleApiAction(context, testItem)
3030

3131
await flushPromises()
3232

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

3737
axios.post.mockImplementationOnce(() => {
3838
throw 'error'
3939
})
40-
actions.fakeApiAction(context)
40+
actions.exampleApiAction(context)
4141

4242
expect(axios.post).toHaveBeenCalledTimes(2)
43-
expect(context.commit).toHaveBeenCalledWith('fakeCommit', false)
43+
expect(context.commit).toHaveBeenCalledWith('exampleCommit', false)
4444
})
4545
})

‎done/tests/unit/AddMeeting.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jest.mock('axios')
1313
// Check for more: https://jestjs.io/docs/en/timer-mocks
1414
jest.useFakeTimers()
1515

16-
describe('AddMeeting page', () => {
16+
describe('views/AddMeeting.vue', () => {
1717
let present
1818
let next
1919

‎done/tests/unit/Checkbox.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const propsData = {
77
value: false
88
}
99

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

‎done/tests/unit/getters.spec.js renamed to ‎done/tests/unit/Getters.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { getters } from '@/store'
22
import { advanceTo, clear } from 'jest-date-mock'
33

4-
describe('getters - store', () => {
4+
describe('store/getters', () => {
55
beforeEach(() => {
66
advanceTo(new Date('2020-03-27T00:00:05Z'))
77
})

‎done/tests/unit/Home.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createWrapper, createStore } from '../factory'
22
import HomePage from '@/views/Home.vue'
33

4-
describe('Home page', () => {
4+
describe('views/Home.vue', () => {
55
it('meeting list contains elements from store', () => {
66
const localStore = createStore({ state: {
77
meetingList: [

‎done/tests/unit/Message.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const propsData = {
99
isMessageShowed: false
1010
}
1111

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

‎done/tests/unit/mutations.spec.js renamed to ‎done/tests/unit/Mutations.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { mutations } from '@/store'
22

3-
describe('mutations - store', () => {
3+
describe('store/mutations', () => {
44
it('addMeeting push item to state.meetingList', () => {
55
const newElement = {
66
'date': '2020-03-27',

‎done/tests/unit/vuex-store-instance.spec.js renamed to ‎done/tests/unit/VuexStoreInstance.spec.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ localVue.use(Vuex)
88

99
jest.mock('axios')
1010

11-
describe('vuex store instance', () => {
11+
describe('Vuex store instance', () => {
1212
let store
1313
let storeConfig
1414

@@ -19,21 +19,21 @@ describe('vuex store instance', () => {
1919
addMeeting (state, data) {
2020
state.meetingList.push(data)
2121
},
22-
fakeCommit () {
22+
exampleCommit () {
2323
return true
2424
}
2525
},
2626
actions: {
2727
doReservation ({ commit }, data) {
2828
commit('addMeeting', data)
2929
},
30-
async fakeApiAction ({ commit }, data) {
30+
async exampleApiAction ({ commit }, data) {
3131
try {
32-
await axios.post('http://localhost:5679/fake/confirmMeeting', data)
33-
commit('fakeCommit', true)
32+
await axios.post('http://localhost:5679/example/confirmMeeting', data)
33+
commit('exampleCommit', true)
3434
}
3535
catch (error) {
36-
commit('fakeCommit', false)
36+
commit('exampleCommit', false)
3737
}
3838
}
3939
},
@@ -62,20 +62,20 @@ describe('vuex store instance', () => {
6262
expect(store.state.meetingList).toStrictEqual([testElement, testElement])
6363
})
6464

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

68-
store.dispatch('fakeApiAction', testItem)
68+
store.dispatch('exampleApiAction', testItem)
6969

7070
await flushPromises()
7171

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

7575
axios.post.mockImplementationOnce(() => {
7676
throw 'error'
7777
})
78-
store.dispatch('fakeApiAction', testItem)
78+
store.dispatch('exampleApiAction', testItem)
7979

8080
expect(axios.post).toHaveBeenCalledTimes(2)
8181
})

‎done/tests/unit/__snapshots__/AddMeeting.spec.js.snap

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`AddMeeting page button can be disable or enabled 1`] = `
3+
exports[`views/AddMeeting.vue button can be disable or enabled 1`] = `
44
<div class="add-meeting">
55
<div class="add-meeting__container">
66
<h1>Add meeting</h1>
@@ -42,7 +42,7 @@ exports[`AddMeeting page button can be disable or enabled 1`] = `
4242
</div>
4343
`;
4444
45-
exports[`AddMeeting page button can be disable or enabled 2`] = `
45+
exports[`views/AddMeeting.vue button can be disable or enabled 2`] = `
4646
"Snapshot Diff:
4747
- First value
4848
+ Second value
@@ -68,7 +68,7 @@ exports[`AddMeeting page button can be disable or enabled 2`] = `
6868
"
6969
`;
7070
71-
exports[`AddMeeting page can add meeting to store 1`] = `
71+
exports[`views/AddMeeting.vue can add meeting to store 1`] = `
7272
<div class="add-meeting add-meeting--loading">
7373
<div class="add-meeting__container">
7474
<h1>Add meeting</h1>
@@ -101,7 +101,7 @@ exports[`AddMeeting page can add meeting to store 1`] = `
101101
</div>
102102
`;
103103
104-
exports[`AddMeeting page can add meeting to store 2`] = `
104+
exports[`views/AddMeeting.vue can add meeting to store 2`] = `
105105
"Snapshot Diff:
106106
- First value
107107
+ Second value
@@ -140,7 +140,7 @@ exports[`AddMeeting page can add meeting to store 2`] = `
140140
"
141141
`;
142142
143-
exports[`AddMeeting page can add meeting to store 3`] = `
143+
exports[`views/AddMeeting.vue can add meeting to store 3`] = `
144144
"Snapshot Diff:
145145
- First value
146146
+ Second value
@@ -171,7 +171,7 @@ exports[`AddMeeting page can add meeting to store 3`] = `
171171
</div>"
172172
`;
173173
174-
exports[`AddMeeting page can set custom meeting day in form 1`] = `
174+
exports[`views/AddMeeting.vue can set custom meeting day in form 1`] = `
175175
<div class="add-meeting">
176176
<div class="add-meeting__container">
177177
<h1>Add meeting</h1>
@@ -213,12 +213,12 @@ exports[`AddMeeting page can set custom meeting day in form 1`] = `
213213
</div>
214214
`;
215215
216-
exports[`AddMeeting page can set custom meeting day in form 2`] = `
216+
exports[`views/AddMeeting.vue can set custom meeting day in form 2`] = `
217217
"Snapshot Diff:
218218
Compared values have no visual difference."
219219
`;
220220
221-
exports[`AddMeeting page default form is rendered 1`] = `
221+
exports[`views/AddMeeting.vue default form is rendered 1`] = `
222222
<div class="add-meeting add-meeting--loading">
223223
<div class="add-meeting__container">
224224
<h1>Add meeting</h1>
@@ -251,7 +251,7 @@ exports[`AddMeeting page default form is rendered 1`] = `
251251
</div>
252252
`;
253253
254-
exports[`AddMeeting page error is showed when form is invalid 1`] = `
254+
exports[`views/AddMeeting.vue error is showed when form is invalid 1`] = `
255255
<div class="add-meeting add-meeting--loading">
256256
<div class="add-meeting__container">
257257
<h1>Add meeting</h1>
@@ -284,7 +284,7 @@ exports[`AddMeeting page error is showed when form is invalid 1`] = `
284284
</div>
285285
`;
286286
287-
exports[`AddMeeting page error is showed when form is invalid 2`] = `
287+
exports[`views/AddMeeting.vue error is showed when form is invalid 2`] = `
288288
"Snapshot Diff:
289289
- First value
290290
+ Second value
@@ -306,7 +306,7 @@ exports[`AddMeeting page error is showed when form is invalid 2`] = `
306306
"
307307
`;
308308
309-
exports[`AddMeeting page has loading class when form is blocked 1`] = `
309+
exports[`views/AddMeeting.vue has loading class when form is blocked 1`] = `
310310
<div class="add-meeting add-meeting--loading">
311311
<div class="add-meeting__container">
312312
<h1>Add meeting</h1>
@@ -339,7 +339,7 @@ exports[`AddMeeting page has loading class when form is blocked 1`] = `
339339
</div>
340340
`;
341341
342-
exports[`AddMeeting page has loading class when form is blocked 2`] = `
342+
exports[`views/AddMeeting.vue has loading class when form is blocked 2`] = `
343343
"Snapshot Diff:
344344
- First value
345345
+ Second value
@@ -370,7 +370,7 @@ exports[`AddMeeting page has loading class when form is blocked 2`] = `
370370
</div>"
371371
`;
372372
373-
exports[`AddMeeting page predefined addreses are available 1`] = `
373+
exports[`views/AddMeeting.vue predefined addreses are available 1`] = `
374374
<div class="add-meeting add-meeting--loading">
375375
<div class="add-meeting__container">
376376
<h1>Add meeting</h1>
@@ -403,7 +403,7 @@ exports[`AddMeeting page predefined addreses are available 1`] = `
403403
</div>
404404
`;
405405
406-
exports[`AddMeeting page predefined addreses are available 2`] = `
406+
exports[`views/AddMeeting.vue predefined addreses are available 2`] = `
407407
"Snapshot Diff:
408408
- First value
409409
+ Second value
@@ -434,7 +434,7 @@ exports[`AddMeeting page predefined addreses are available 2`] = `
434434
</div>"
435435
`;
436436
437-
exports[`AddMeeting page predefined checkbox toggle fields and clear values 1`] = `
437+
exports[`views/AddMeeting.vue predefined checkbox toggle fields and clear values 1`] = `
438438
<div class="add-meeting">
439439
<div class="add-meeting__container">
440440
<h1>Add meeting</h1>
@@ -476,7 +476,7 @@ exports[`AddMeeting page predefined checkbox toggle fields and clear values 1`]
476476
</div>
477477
`;
478478
479-
exports[`AddMeeting page predefined checkbox toggle fields and clear values 2`] = `
479+
exports[`views/AddMeeting.vue predefined checkbox toggle fields and clear values 2`] = `
480480
"Snapshot Diff:
481481
- First value
482482
+ Second value
@@ -507,12 +507,12 @@ exports[`AddMeeting page predefined checkbox toggle fields and clear values 2`]
507507
<div class=\\"add-meeting__wrapper\\"><label for=\\"meetingDate\\">"
508508
`;
509509
510-
exports[`AddMeeting page predefined checkbox toggle fields and clear values 3`] = `
510+
exports[`views/AddMeeting.vue predefined checkbox toggle fields and clear values 3`] = `
511511
"Snapshot Diff:
512512
Compared values have no visual difference."
513513
`;
514514
515-
exports[`AddMeeting page predefined checkbox toggle fields and clear values 4`] = `
515+
exports[`views/AddMeeting.vue predefined checkbox toggle fields and clear values 4`] = `
516516
"Snapshot Diff:
517517
- First value
518518
+ Second value
@@ -543,7 +543,7 @@ exports[`AddMeeting page predefined checkbox toggle fields and clear values 4`]
543543
<div class=\\"add-meeting__wrapper\\"><label for=\\"meetingDate\\">"
544544
`;
545545
546-
exports[`AddMeeting page predefined select change value to selected option 1`] = `
546+
exports[`views/AddMeeting.vue predefined select change value to selected option 1`] = `
547547
<div class="add-meeting">
548548
<div class="add-meeting__container">
549549
<h1>Add meeting</h1>
@@ -585,7 +585,7 @@ exports[`AddMeeting page predefined select change value to selected option 1`] =
585585
</div>
586586
`;
587587
588-
exports[`AddMeeting page predefined select change value to selected option 2`] = `
588+
exports[`views/AddMeeting.vue predefined select change value to selected option 2`] = `
589589
"Snapshot Diff:
590590
Compared values have no visual difference."
591591
`;

‎done/tests/unit/__snapshots__/Checkbox.spec.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`Checkbox.vue default component matches snapshot 1`] = `
3+
exports[`components/Checkbox.vue default component matches snapshot 1`] = `
44
<div class="checkbox"><label for="checkbox1">
55
label prop
66
</label> <input id="checkbox1" type="checkbox"></div>

‎done/tests/unit/__snapshots__/Home.spec.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`Home page meeting list contains elements from store 1`] = `
3+
exports[`views/Home.vue meeting list contains elements from store 1`] = `
44
<div class="home">
55
<div class="home__list">
66
<div class="home__item">

‎done/tests/unit/__snapshots__/Message.spec.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`Message.vue default component matches snapshot 1`] = `
3+
exports[`components/Message.vue default component matches snapshot 1`] = `
44
<div class="message">
55
<h2>
66
test title

‎practices/tests/unit/Actions.spec.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { actions } from '@/store'
2+
3+
describe('store/actions', () => {
4+
// it('doReservation commits to mutation', () => {
5+
// })
6+
7+
// it('exampleApiAction makes commit based on API response', async () => {
8+
// })
9+
})

‎practices/tests/unit/AddMeeting.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jest.mock('axios')
1212
// Check for more: https://jestjs.io/docs/en/timer-mocks
1313
jest.useFakeTimers()
1414

15-
describe('AddMeeting page', () => {
15+
describe('views/AddMeeting.vue', () => {
1616
beforeEach(() => {
1717
})
1818

0 commit comments

Comments
 (0)