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
|
import createDiff from '~/ide/lib/create_diff';
import createFileDiff from '~/ide/lib/create_file_diff';
import { commitActionTypes } from '~/ide/constants';
import {
createNewFile,
createUpdatedFile,
createDeletedFile,
createMovedFile,
createEntries,
} from '../file_helpers';
const PATH_FOO = 'test/foo.md';
const PATH_BAR = 'test/bar.md';
const PATH_ZED = 'test/zed.md';
const PATH_LOREM = 'test/lipsum/nested/lorem.md';
const PATH_IPSUM = 'test/lipsum/ipsum.md';
const TEXT = `Lorem ipsum dolor sit amet,
consectetur adipiscing elit.
Morbi ex dolor, euismod nec rutrum nec, egestas at ligula.
Praesent scelerisque ut nisi eu eleifend.
Suspendisse potenti.
`;
const LINES = TEXT.trim().split('\n');
const joinDiffs = (...patches) => patches.join('');
describe('IDE lib/create_diff', () => {
it('with created files, generates patch', () => {
const changedFiles = [createNewFile(PATH_FOO, TEXT), createNewFile(PATH_BAR, '')];
const result = createDiff({ changedFiles });
expect(result).toEqual({
patch: joinDiffs(
createFileDiff(changedFiles[0], commitActionTypes.create),
createFileDiff(changedFiles[1], commitActionTypes.create),
),
toDelete: [],
});
});
it('with deleted files, adds to delete', () => {
const changedFiles = [createDeletedFile(PATH_FOO, TEXT), createDeletedFile(PATH_BAR, '')];
const result = createDiff({ changedFiles });
expect(result).toEqual({
patch: '',
toDelete: [PATH_FOO, PATH_BAR],
});
});
it('with updated files, generates patch', () => {
const changedFiles = [createUpdatedFile(PATH_FOO, TEXT, 'A change approaches!')];
const result = createDiff({ changedFiles });
expect(result).toEqual({
patch: createFileDiff(changedFiles[0], commitActionTypes.update),
toDelete: [],
});
});
it('with files in both staged and changed, prefer changed', () => {
const changedFiles = [
createUpdatedFile(PATH_FOO, TEXT, 'Do a change!'),
createDeletedFile(PATH_LOREM),
];
const result = createDiff({
changedFiles,
stagedFiles: [createUpdatedFile(PATH_LOREM, TEXT, ''), createDeletedFile(PATH_FOO, TEXT)],
});
expect(result).toEqual({
patch: createFileDiff(changedFiles[0], commitActionTypes.update),
toDelete: [PATH_LOREM],
});
});
it('with file created in staging and deleted in changed, do nothing', () => {
const result = createDiff({
changedFiles: [createDeletedFile(PATH_FOO)],
stagedFiles: [createNewFile(PATH_FOO, TEXT)],
});
expect(result).toEqual({
patch: '',
toDelete: [],
});
});
it('with file deleted in both staged and changed, delete', () => {
const result = createDiff({
changedFiles: [createDeletedFile(PATH_LOREM)],
stagedFiles: [createDeletedFile(PATH_LOREM)],
});
expect(result).toEqual({
patch: '',
toDelete: [PATH_LOREM],
});
});
it('with file moved, create and delete', () => {
const changedFiles = [createMovedFile(PATH_BAR, PATH_FOO, TEXT)];
const result = createDiff({
changedFiles,
stagedFiles: [createDeletedFile(PATH_FOO)],
});
expect(result).toEqual({
patch: createFileDiff(changedFiles[0], commitActionTypes.create),
toDelete: [PATH_FOO],
});
});
it('with file moved and no content, move', () => {
const changedFiles = [createMovedFile(PATH_BAR, PATH_FOO)];
const result = createDiff({
changedFiles,
stagedFiles: [createDeletedFile(PATH_FOO)],
});
expect(result).toEqual({
patch: createFileDiff(changedFiles[0], commitActionTypes.move),
toDelete: [],
});
});
it('creates a well formatted patch', () => {
const changedFiles = [
createMovedFile(PATH_BAR, PATH_FOO),
createDeletedFile(PATH_ZED),
createNewFile(PATH_LOREM, TEXT),
createUpdatedFile(PATH_IPSUM, TEXT, "That's all folks!"),
];
const expectedPatch = `diff --git "a/${PATH_FOO}" "b/${PATH_BAR}"
rename from ${PATH_FOO}
rename to ${PATH_BAR}
diff --git "a/${PATH_LOREM}" "b/${PATH_LOREM}"
new file mode 100644
--- /dev/null
+++ b/${PATH_LOREM}
@@ -0,0 +1,${LINES.length} @@
${LINES.map(line => `+${line}`).join('\n')}
diff --git "a/${PATH_IPSUM}" "b/${PATH_IPSUM}"
--- a/${PATH_IPSUM}
+++ b/${PATH_IPSUM}
@@ -1,${LINES.length} +1,1 @@
${LINES.map(line => `-${line}`).join('\n')}
+That's all folks!
\\ No newline at end of file
`;
const result = createDiff({ changedFiles });
expect(result).toEqual({
patch: expectedPatch,
toDelete: [PATH_ZED],
});
});
it('deletes deleted parent directories', () => {
const deletedFiles = ['foo/bar/zed/test.md', 'foo/bar/zed/test2.md'];
const entries = deletedFiles.reduce((acc, path) => Object.assign(acc, createEntries(path)), {});
const allDeleted = [...deletedFiles, 'foo/bar/zed', 'foo/bar'];
allDeleted.forEach(path => {
entries[path].deleted = true;
});
const changedFiles = deletedFiles.map(x => entries[x]);
const result = createDiff({ changedFiles, entries });
expect(result).toEqual({
patch: '',
toDelete: allDeleted,
});
});
});
|
