Skip to content
Navigation Menu
{{ message }}
forked from atom/github
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathconflict.test.js
More file actions
280 lines (227 loc) · 8.49 KB
/
Copy pathconflict.test.js
File metadata and controls
280 lines (227 loc) · 8.49 KB
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
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
import EventEmitter from 'events';
import path from 'path';
import Conflict from '../../../lib/models/conflicts/conflict';
import {TOP, MIDDLE, BOTTOM} from '../../../lib/models/conflicts/position';
import {OURS, BASE, THEIRS} from '../../../lib/models/conflicts/source';
describe('Conflict', function() {
let atomEnv;
beforeEach(function() {
atomEnv = global.buildAtomEnvironment();
});
afterEach(function() {
atomEnv.destroy();
});
const editorOnFixture = function(name) {
const fullPath = path.join(path.dirname(__filename), '..', '..', 'fixtures', 'conflict-marker-examples', name);
return atomEnv.workspace.open(fullPath);
};
const assertConflictOnRows = function(conflict, description, message) {
const isRangeOnRows = function(range, startRow, endRow, rangeName) {
assert(
range.start.row === startRow && range.start.column === 0 && range.end.row === endRow && range.end.column === 0,
`expected conflict's ${rangeName} range to cover rows ${startRow} to ${endRow}, but it was ${range}`,
);
};
const isRangeOnRow = function(range, row, rangeName) {
return isRangeOnRows(range, row, row + 1, rangeName);
};
const ourBannerRange = conflict.getSide(OURS).banner.marker.getBufferRange();
isRangeOnRow(ourBannerRange, description.ourBannerRow, '"ours" banner');
const ourSideRange = conflict.getSide(OURS).marker.getBufferRange();
isRangeOnRows(ourSideRange, description.ourSideRows[0], description.ourSideRows[1], '"ours"');
assert.strictEqual(conflict.getSide(OURS).position, description.ourPosition || TOP, '"ours" in expected position');
const theirBannerRange = conflict.getSide(THEIRS).banner.marker.getBufferRange();
isRangeOnRow(theirBannerRange, description.theirBannerRow, '"theirs" banner');
const theirSideRange = conflict.getSide(THEIRS).marker.getBufferRange();
isRangeOnRows(theirSideRange, description.theirSideRows[0], description.theirSideRows[1], '"theirs"');
assert.strictEqual(conflict.getSide(THEIRS).position, description.theirPosition || BOTTOM, '"theirs" in expected position');
if (description.baseBannerRow || description.baseSideRows) {
assert.isNotNull(conflict.getSide(BASE), "expected conflict's base side to be non-null");
const baseBannerRange = conflict.getSide(BASE).banner.marker.getBufferRange();
isRangeOnRow(baseBannerRange, description.baseBannerRow, '"base" banner');
const baseSideRange = conflict.getSide(BASE).marker.getBufferRange();
isRangeOnRows(baseSideRange, description.baseSideRows[0], description.baseSideRows[1], '"base"');
assert.strictEqual(conflict.getSide(BASE).position, MIDDLE, '"base" in MIDDLE position');
} else {
assert.isUndefined(conflict.getSide(BASE), "expected conflict's base side to be undefined");
}
const separatorRange = conflict.separator.marker.getBufferRange();
isRangeOnRow(separatorRange, description.separatorRow, 'separator');
};
it('parses 2-way diff markings', async function() {
const editor = await editorOnFixture('single-2way-diff.txt');
const conflicts = Conflict.allFromEditor(editor, editor.getDefaultMarkerLayer(), false);
assert.equal(conflicts.length, 1);
assertConflictOnRows(conflicts[0], {
ourBannerRow: 2,
ourSideRows: [3, 4],
separatorRow: 4,
theirSideRows: [5, 6],
theirBannerRow: 6,
});
});
it('parses multiple 2-way diff markings', async function() {
const editor = await editorOnFixture('multi-2way-diff.txt');
const conflicts = Conflict.allFromEditor(editor, editor.getDefaultMarkerLayer(), false);
assert.equal(conflicts.length, 2);
assertConflictOnRows(conflicts[0], {
ourBannerRow: 4,
ourSideRows: [5, 7],
separatorRow: 7,
theirSideRows: [8, 9],
theirBannerRow: 9,
});
assertConflictOnRows(conflicts[1], {
ourBannerRow: 13,
ourSideRows: [14, 15],
separatorRow: 15,
theirSideRows: [16, 17],
theirBannerRow: 17,
});
});
it('parses 3-way diff markings', async function() {
const editor = await editorOnFixture('single-3way-diff.txt');
const conflicts = Conflict.allFromEditor(editor, editor.getDefaultMarkerLayer(), false);
assert.equal(conflicts.length, 1);
assertConflictOnRows(conflicts[0], {
ourBannerRow: 0,
ourSideRows: [1, 2],
baseBannerRow: 2,
baseSideRows: [3, 4],
separatorRow: 4,
theirSideRows: [5, 6],
theirBannerRow: 6,
});
});
it('parses recursive 3-way diff markings', async function() {
const editor = await editorOnFixture('single-3way-diff-complex.txt');
const conflicts = Conflict.allFromEditor(editor, editor.getDefaultMarkerLayer(), false);
assert.equal(conflicts.length, 1);
assertConflictOnRows(conflicts[0], {
ourBannerRow: 0,
ourSideRows: [1, 2],
baseBannerRow: 2,
baseSideRows: [3, 18],
separatorRow: 18,
theirSideRows: [19, 20],
theirBannerRow: 20,
});
});
it('flips "ours" and "theirs" sides when rebasing', async function() {
const editor = await editorOnFixture('rebase-2way-diff.txt');
const conflicts = Conflict.allFromEditor(editor, editor.getDefaultMarkerLayer(), true);
assert.equal(conflicts.length, 1);
assertConflictOnRows(conflicts[0], {
theirBannerRow: 2,
theirSideRows: [3, 4],
theirPosition: TOP,
separatorRow: 4,
ourSideRows: [5, 6],
ourBannerRow: 6,
ourPosition: BOTTOM,
});
});
it('is resilient to malformed 2-way diff markings', async function() {
const editor = await editorOnFixture('corrupted-2way-diff.txt');
const conflicts = Conflict.allFromEditor(editor, editor.getDefaultMarkerLayer(), true);
assert.equal(conflicts.length, 0);
});
it('is resilient to malformed 3-way diff markings', async function() {
const editor = await editorOnFixture('corrupted-3way-diff.txt');
const conflicts = Conflict.allFromEditor(editor, editor.getDefaultMarkerLayer(), true);
assert.equal(conflicts.length, 0);
});
describe('counting conflicts', function() {
let readStream, countPromise;
beforeEach(function() {
readStream = new EventEmitter();
countPromise = Conflict.countFromStream(readStream);
});
it('counts conflicts from a streamed file', async function() {
readStream.emit('data', `
before
before
<<<<<<< HEAD
aaa
=======
bbb
>>>>>>> master
middle
middle
`);
readStream.emit('data', `
middle
middle
<<<<<<< HEAD
aaa
=======
bbb
>>>>>>> master
end
end
`);
readStream.emit('end');
assert.equal(await countPromise, 2);
});
it('counts conflicts that span stream chunks', async function() {
readStream.emit('data', `
before
before
<<<<<<< HEAD
aaa
=======
`);
readStream.emit('data', `bbb
>>>>>>> master
end
end
`);
readStream.emit('end');
assert.equal(await countPromise, 1);
});
it('handles conflict markers broken across chunks', async function() {
readStream.emit('data', `
before
<<<`);
readStream.emit('data', `<<<< HEAD
aaa
=======
bbb
>>>>>>> master
end
end
`);
readStream.emit('end');
assert.equal(await countPromise, 1);
});
});
describe('change detection', function() {
let editor, conflict;
beforeEach(async function() {
editor = await editorOnFixture('single-2way-diff.txt');
conflict = Conflict.allFromEditor(editor, editor.getDefaultMarkerLayer(), false)[0];
});
it('detects when a side has been modified', function() {
assert.isFalse(conflict.getSide(OURS).isBannerModified());
assert.isFalse(conflict.getSide(OURS).isModified());
editor.setCursorBufferPosition([3, 1]);
editor.insertText('nah');
assert.isFalse(conflict.getSide(OURS).isBannerModified());
assert.isTrue(conflict.getSide(OURS).isModified());
});
it('detects when a banner has been modified', function() {
assert.isFalse(conflict.getSide(OURS).isBannerModified());
assert.isFalse(conflict.getSide(OURS).isModified());
editor.setCursorBufferPosition([2, 1]);
editor.insertText('your problem now');
assert.isTrue(conflict.getSide(OURS).isBannerModified());
assert.isFalse(conflict.getSide(OURS).isModified());
});
it('detects when a separator has been modified', function() {
assert.isFalse(conflict.getSeparator().isModified());
editor.setCursorBufferPosition([4, 3]);
editor.insertText('wat');
assert.isTrue(conflict.getSeparator().isModified());
});
});
});
You can’t perform that action at this time.