Skip to content

Commit 0bc9792

Browse files
deanfchungdeanfchung
committed
resolved merge conflicts
2 parents 17aff18 + a83d5ad commit 0bc9792

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+155
-154
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ node_modules
1010
npm-debug.log*
1111
yarn-debug.log*
1212
yarn-error.log*
13+
/test/jest/coverage
1314

1415
# Editor directories and files
1516
.idea

‎test/jest/__tests__/App.spec.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ describe('Mount Quasar', () => {
6565
})
6666
*/
6767
describe('actions', () => {
68-
let userActions;
69-
let userStore;
70-
68+
let actions;
69+
let store;
7170
beforeEach(() => {
71+
const dummyFunction = jest.fn(() => 'hello')
7272
actions = {
73-
userActionInput: jest.fn(),
74-
userStore: jest.fn()
73+
userActionInput: dummyFunction,
74+
userStore: dummyFunction
7575
}
7676
store = new Vuex.Store({
7777
actions

‎test/jest/coverage/clover.xml

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.

‎test/jest/coverage/coverage-final.json

Lines changed: 34 additions & 34 deletions
Large diffs are not rendered by default.

‎test/jest/coverage/lcov-report/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ <h1>
197197
</div><!-- /wrapper -->
198198
<div class='footer quiet pad2 space-top1 center small'>
199199
Code coverage
200-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:18:19 GMT-0700 (Pacific Daylight Time)
200+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
201201
</div>
202202
</div>
203203
<script src="prettify.js"></script>

‎test/jest/coverage/lcov-report/src-electron/main-process/electron-main.dev.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ <h1>
118118
</div><!-- /wrapper -->
119119
<div class='footer quiet pad2 space-top1 center small'>
120120
Code coverage
121-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:18:19 GMT-0700 (Pacific Daylight Time)
121+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
122122
</div>
123123
</div>
124124
<script src="../../prettify.js"></script>

‎test/jest/coverage/lcov-report/src-electron/main-process/electron-main.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ <h1>
187187
</div><!-- /wrapper -->
188188
<div class='footer quiet pad2 space-top1 center small'>
189189
Code coverage
190-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:18:19 GMT-0700 (Pacific Daylight Time)
190+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
191191
</div>
192192
</div>
193193
<script src="../../prettify.js"></script>

‎test/jest/coverage/lcov-report/src-electron/main-process/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ <h1>
9393
</div><!-- /wrapper -->
9494
<div class='footer quiet pad2 space-top1 center small'>
9595
Code coverage
96-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:18:19 GMT-0700 (Pacific Daylight Time)
96+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
9797
</div>
9898
</div>
9999
<script src="../../prettify.js"></script>

‎test/jest/coverage/lcov-report/src-pwa/custom-service-worker.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h1>
6767
</div><!-- /wrapper -->
6868
<div class='footer quiet pad2 space-top1 center small'>
6969
Code coverage
70-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:18:19 GMT-0700 (Pacific Daylight Time)
70+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
7171
</div>
7272
</div>
7373
<script src="../prettify.js"></script>

‎test/jest/coverage/lcov-report/src-pwa/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ <h1>
9393
</div><!-- /wrapper -->
9494
<div class='footer quiet pad2 space-top1 center small'>
9595
Code coverage
96-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:18:19 GMT-0700 (Pacific Daylight Time)
96+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jul 15 2019 14:22:10 GMT-0700 (Pacific Daylight Time)
9797
</div>
9898
</div>
9999
<script src="../prettify.js"></script>

0 commit comments

Comments
 (0)