1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
|
import { shallowMount } from '@vue/test-utils';
import { nextTick } from 'vue';
import Vuex from 'vuex';
import Autosave from '~/autosave';
import DiffLineNoteForm from '~/diffs/components/diff_line_note_form.vue';
import { createModules } from '~/mr_notes/stores';
import NoteForm from '~/notes/components/note_form.vue';
import MultilineCommentForm from '~/notes/components/multiline_comment_form.vue';
import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
import { noteableDataMock } from 'jest/notes/mock_data';
import { getDiffFileMock } from '../mock_data/diff_file';
jest.mock('~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal');
jest.mock('~/autosave');
describe('DiffLineNoteForm', () => {
let wrapper;
let diffFile;
let diffLines;
let actions;
let store;
const getSelectedLine = () => {
const lineCode = diffLines[1].line_code;
return diffFile.highlighted_diff_lines.find((l) => l.line_code === lineCode);
};
const createStore = (state) => {
const modules = createModules();
modules.diffs.actions = {
...modules.diffs.actions,
saveDiffDiscussion: jest.fn(() => Promise.resolve()),
};
modules.diffs.getters = {
...modules.diffs.getters,
diffCompareDropdownTargetVersions: jest.fn(),
diffCompareDropdownSourceVersions: jest.fn(),
selectedSourceIndex: jest.fn(),
};
modules.notes.getters = {
...modules.notes.getters,
noteableType: jest.fn(),
};
actions = modules.diffs.actions;
store = new Vuex.Store({ modules });
store.state.notes.userData.id = 1;
store.state.notes.noteableData = noteableDataMock;
store.replaceState({ ...store.state, ...state });
};
const createComponent = ({ props, state } = {}) => {
wrapper?.destroy();
diffFile = getDiffFileMock();
diffLines = diffFile.highlighted_diff_lines;
createStore(state);
store.state.diffs.diffFiles = [diffFile];
const propsData = {
diffFileHash: diffFile.file_hash,
diffLines,
line: diffLines[1],
range: { start: diffLines[0], end: diffLines[1] },
noteTargetLine: diffLines[1],
...props,
};
wrapper = shallowMount(DiffLineNoteForm, {
store,
propsData,
});
};
const findNoteForm = () => wrapper.findComponent(NoteForm);
const findCommentForm = () => wrapper.findComponent(MultilineCommentForm);
beforeEach(() => {
Autosave.mockClear();
createComponent();
});
it('shows note form', () => {
expect(wrapper.findComponent(NoteForm).exists()).toBe(true);
});
it('passes the provided range of lines to comment form', () => {
expect(findCommentForm().props('lineRange')).toMatchObject({
start: diffLines[0],
end: diffLines[1],
});
});
it('respects empty range when passing a range of lines', () => {
createComponent({ props: { range: null } });
expect(findCommentForm().props('lineRange')).toMatchObject({
start: diffLines[1],
end: diffLines[1],
});
});
it('should init autosave', () => {
// we're using shallow mount here so there's no element to pass to Autosave
expect(Autosave).toHaveBeenCalledWith(undefined, [
'Note',
'Issue',
98,
undefined,
'DiffNote',
undefined,
'1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_2',
]);
});
describe('when cancelling form', () => {
afterEach(() => {
confirmAction.mockReset();
});
it('should only ask for confirmation once', () => {
let finalizePromise;
confirmAction.mockImplementation(
() =>
new Promise((resolve) => {
finalizePromise = resolve;
}),
);
findNoteForm().vm.$emit('cancelForm', true, true);
findNoteForm().vm.$emit('cancelForm', true, true);
expect(confirmAction).toHaveBeenCalledTimes(1);
finalizePromise();
});
describe('with confirmation', () => {
beforeEach(() => {
confirmAction.mockResolvedValueOnce(true);
});
it('should ask form confirmation and hide form for a line', async () => {
findNoteForm().vm.$emit('cancelForm', true, true);
await nextTick();
expect(confirmAction).toHaveBeenCalled();
await nextTick();
expect(getSelectedLine().hasForm).toBe(false);
expect(Autosave.mock.instances[0].reset).toHaveBeenCalled();
});
});
describe('without confirmation', () => {
beforeEach(() => {
confirmAction.mockResolvedValueOnce(false);
});
it('should ask for confirmation when shouldConfirm and isDirty passed as truthy', () => {
findNoteForm().vm.$emit('cancelForm', true, true);
expect(confirmAction).toHaveBeenCalled();
});
it('should not ask for confirmation when one of the params false', () => {
findNoteForm().vm.$emit('cancelForm', true, false);
expect(confirmAction).not.toHaveBeenCalled();
findNoteForm().vm.$emit('cancelForm', false, true);
expect(confirmAction).not.toHaveBeenCalled();
});
});
});
describe('saving note', () => {
it('should save original line', async () => {
const lineRange = {
start: {
line_code: diffLines[1].line_code,
type: diffLines[1].type,
new_line: 2,
old_line: null,
},
end: {
line_code: diffLines[1].line_code,
type: diffLines[1].type,
new_line: 2,
old_line: null,
},
};
await findNoteForm().vm.$emit('handleFormUpdate', 'note body');
expect(actions.saveDiffDiscussion.mock.calls[0][1].formData).toMatchObject({
lineRange,
});
});
it('should save selected line from the store', async () => {
const lineCode = 'test';
store.state.notes.selectedCommentPosition = { start: { line_code: lineCode } };
createComponent({ state: store.state });
await findNoteForm().vm.$emit('handleFormUpdate', 'note body');
expect(actions.saveDiffDiscussion.mock.calls[0][1].formData.lineRange.start.line_code).toBe(
lineCode,
);
});
});
});
|
