diff-server/handlers_test.go at 9faf9ff9ab885e4bcd0218424d910259017eacfa · kitproj/diff-server · GitHub

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
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
package main

import (
	"net/http"
	"net/http/httptest"
	"os"
	"os/exec"
	"path/filepath"
	"strings"
	"testing"
)

func setupTestGitRepo(t *testing.T, dir string) {
	t.Helper()

	cmd := exec.Command("git", "init")
	cmd.Dir = dir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to init git repo: %v", err)
	}

	cmd = exec.Command("git", "config", "user.email", "test@example.com")
	cmd.Dir = dir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to set git email: %v", err)
	}

	cmd = exec.Command("git", "config", "user.name", "Test User")
	cmd.Dir = dir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to set git name: %v", err)
	}
}

func TestServeDiffsHTML(t *testing.T) {
	req := httptest.NewRequest("GET", "/", nil)
	req.Header.Set("Accept", "text/html")

	w := httptest.NewRecorder()
	diffsHandler(w, req)

	resp := w.Result()
	if resp.StatusCode != http.StatusOK {
		t.Errorf("expected status 200, got %d", resp.StatusCode)
	}

	contentType := resp.Header.Get("Content-Type")
	if !strings.Contains(contentType, "text/html") {
		t.Errorf("expected content-type text/html, got %s", contentType)
	}

	body := w.Body.String()
	if !strings.Contains(body, "<!doctype html>") {
		t.Errorf("expected HTML document")
	}
}

func TestServeDiffsText_PWDIsGitRepo(t *testing.T) {
	tmpDir := t.TempDir()

	setupTestGitRepo(t, tmpDir)

	testFile := filepath.Join(tmpDir, "test.txt")
	if err := os.WriteFile(testFile, []byte("initial content\n"), 0644); err != nil {
		t.Fatalf("failed to write test file: %v", err)
	}

	cmd := exec.Command("git", "add", "test.txt")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to git add: %v", err)
	}

	cmd = exec.Command("git", "commit", "-m", "initial commit")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to commit: %v", err)
	}

	if err := os.WriteFile(testFile, []byte("modified content\n"), 0644); err != nil {
		t.Fatalf("failed to modify test file: %v", err)
	}

	oldDir, _ := os.Getwd()
	defer os.Chdir(oldDir)

	if err := os.Chdir(tmpDir); err != nil {
		t.Fatalf("failed to chdir: %v", err)
	}

	req := httptest.NewRequest("GET", "/", nil)
	req.Header.Set("Accept", "text/x-diff")

	w := httptest.NewRecorder()
	diffsHandler(w, req)

	resp := w.Result()
	if resp.StatusCode != http.StatusOK {
		t.Errorf("expected status 200, got %d", resp.StatusCode)
	}

	contentType := resp.Header.Get("Content-Type")
	if !strings.Contains(contentType, "text/x-diff") {
		t.Errorf("expected content-type text/x-diff, got %s", contentType)
	}

	body := w.Body.String()
	if !strings.Contains(body, "diff --git") {
		t.Errorf("expected diff output, got: %s", body)
	}
	if !strings.Contains(body, "test.txt") {
		t.Errorf("expected test.txt in diff, got: %s", body)
	}
}

func TestServeDiffsText_GitSubdirectory(t *testing.T) {
	tmpDir := t.TempDir()

	subDir := filepath.Join(tmpDir, "subproject")
	if err := os.MkdirAll(subDir, 0755); err != nil {
		t.Fatalf("failed to create subdir: %v", err)
	}

	setupTestGitRepo(t, subDir)

	testFile := filepath.Join(subDir, "sub.txt")
	if err := os.WriteFile(testFile, []byte("sub content\n"), 0644); err != nil {
		t.Fatalf("failed to write test file: %v", err)
	}

	cmd := exec.Command("git", "add", "sub.txt")
	cmd.Dir = subDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to git add: %v", err)
	}

	cmd = exec.Command("git", "commit", "-m", "sub commit")
	cmd.Dir = subDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to commit: %v", err)
	}

	if err := os.WriteFile(testFile, []byte("modified sub\n"), 0644); err != nil {
		t.Fatalf("failed to modify test file: %v", err)
	}

	oldDir, _ := os.Getwd()
	defer os.Chdir(oldDir)

	if err := os.Chdir(tmpDir); err != nil {
		t.Fatalf("failed to chdir: %v", err)
	}

	req := httptest.NewRequest("GET", "/", nil)
	req.Header.Set("Accept", "text/x-diff")

	w := httptest.NewRecorder()
	diffsHandler(w, req)

	resp := w.Result()
	if resp.StatusCode != http.StatusOK {
		t.Errorf("expected status 200, got %d", resp.StatusCode)
	}

	body := w.Body.String()
	if !strings.Contains(body, "diff --git") {
		t.Errorf("expected diff output, got: %s", body)
	}
	if !strings.Contains(body, "sub.txt") {
		t.Errorf("expected sub.txt in diff, got: %s", body)
	}
	if !strings.Contains(body, "subproject") {
		t.Errorf("expected subproject in diff path, got: %s", body)
	}
}

func TestServeDiffsText_LargeDiffTruncation(t *testing.T) {
	tmpDir := t.TempDir()

	setupTestGitRepo(t, tmpDir)

	testFile := filepath.Join(tmpDir, "large.txt")
	largeContent := strings.Repeat("x", 1024*1024)
	if err := os.WriteFile(testFile, []byte(largeContent), 0644); err != nil {
		t.Fatalf("failed to write test file: %v", err)
	}

	cmd := exec.Command("git", "add", "large.txt")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to git add: %v", err)
	}

	cmd = exec.Command("git", "commit", "-m", "large commit")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to commit: %v", err)
	}

	modifiedContent := strings.Repeat("y", 1024*1024)
	if err := os.WriteFile(testFile, []byte(modifiedContent), 0644); err != nil {
		t.Fatalf("failed to modify test file: %v", err)
	}

	anotherFile := filepath.Join(tmpDir, "another.txt")
	moreContent := strings.Repeat("z", 5*1024*1024)
	if err := os.WriteFile(anotherFile, []byte(moreContent), 0644); err != nil {
		t.Fatalf("failed to write another file: %v", err)
	}

	cmd = exec.Command("git", "add", "another.txt")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to git add: %v", err)
	}

	cmd = exec.Command("git", "commit", "-m", "another commit")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to commit: %v", err)
	}

	yetAnotherContent := strings.Repeat("w", 5*1024*1024)
	if err := os.WriteFile(anotherFile, []byte(yetAnotherContent), 0644); err != nil {
		t.Fatalf("failed to modify another file: %v", err)
	}

	oldDir, _ := os.Getwd()
	defer os.Chdir(oldDir)

	if err := os.Chdir(tmpDir); err != nil {
		t.Fatalf("failed to chdir: %v", err)
	}

	req := httptest.NewRequest("GET", "/", nil)
	req.Header.Set("Accept", "text/x-diff")

	w := httptest.NewRecorder()
	diffsHandler(w, req)

	resp := w.Result()
	if resp.StatusCode != http.StatusOK {
		t.Errorf("expected status 200, got %d", resp.StatusCode)
	}

	body := w.Body.String()
	if len(body) > 5*1024*1024 {
		t.Errorf("expected diff to be truncated to 5MB, got %d bytes", len(body))
	}

	if len(body) == 0 {
		t.Error("expected some diff output")
	}
}

func TestServeDiffsText_NonGitDirectory(t *testing.T) {
	tmpDir := t.TempDir()

	// Create a non-git directory with a file
	testFile := filepath.Join(tmpDir, "test.txt")
	if err := os.WriteFile(testFile, []byte("test content\n"), 0644); err != nil {
		t.Fatalf("failed to write test file: %v", err)
	}

	oldDir, _ := os.Getwd()
	defer os.Chdir(oldDir)

	if err := os.Chdir(tmpDir); err != nil {
		t.Fatalf("failed to chdir: %v", err)
	}

	req := httptest.NewRequest("GET", "/", nil)
	req.Header.Set("Accept", "text/x-diff")

	w := httptest.NewRecorder()
	diffsHandler(w, req)

	resp := w.Result()
	if resp.StatusCode != http.StatusOK {
		t.Errorf("expected status 200, got %d", resp.StatusCode)
	}

	// Should return empty response since there are no git repos
	// This tests that the handler completes successfully even with no repos
}

func TestServeDiffsText_FeatureBranchShowsAllChanges(t *testing.T) {
	tmpDir := t.TempDir()

	setupTestGitRepo(t, tmpDir)

	// Create initial commit on master
	testFile := filepath.Join(tmpDir, "initial.txt")
	if err := os.WriteFile(testFile, []byte("initial\n"), 0644); err != nil {
		t.Fatalf("failed to write test file: %v", err)
	}

	cmd := exec.Command("git", "add", "initial.txt")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to git add: %v", err)
	}

	cmd = exec.Command("git", "commit", "-m", "initial commit")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to commit: %v", err)
	}

	// Create feature branch
	cmd = exec.Command("git", "checkout", "-b", "feature")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to create feature branch: %v", err)
	}

	// Add committed change on feature branch
	committedFile := filepath.Join(tmpDir, "committed.txt")
	if err := os.WriteFile(committedFile, []byte("committed on feature\n"), 0644); err != nil {
		t.Fatalf("failed to write committed file: %v", err)
	}

	cmd = exec.Command("git", "add", "committed.txt")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to git add: %v", err)
	}

	cmd = exec.Command("git", "commit", "-m", "committed change on feature")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to commit: %v", err)
	}

	// Add uncommitted change on feature branch
	uncommittedFile := filepath.Join(tmpDir, "uncommitted.txt")
	if err := os.WriteFile(uncommittedFile, []byte("uncommitted on feature\n"), 0644); err != nil {
		t.Fatalf("failed to write uncommitted file: %v", err)
	}

	oldDir, _ := os.Getwd()
	defer os.Chdir(oldDir)

	if err := os.Chdir(tmpDir); err != nil {
		t.Fatalf("failed to chdir: %v", err)
	}

	req := httptest.NewRequest("GET", "/", nil)
	req.Header.Set("Accept", "text/x-diff")

	w := httptest.NewRecorder()
	diffsHandler(w, req)

	resp := w.Result()
	if resp.StatusCode != http.StatusOK {
		t.Errorf("expected status 200, got %d", resp.StatusCode)
	}

	body := w.Body.String()

	// Should show both committed and uncommitted changes
	if !strings.Contains(body, "committed.txt") {
		t.Errorf("expected committed.txt in diff (committed change from branch), got: %s", body)
	}
	if !strings.Contains(body, "uncommitted.txt") {
		t.Errorf("expected uncommitted.txt in diff (uncommitted change), got: %s", body)
	}
}

func TestServeDiffsText_MasterBranchShowsOnlyUncommitted(t *testing.T) {
	tmpDir := t.TempDir()

	setupTestGitRepo(t, tmpDir)

	// Create initial commit on master
	testFile := filepath.Join(tmpDir, "initial.txt")
	if err := os.WriteFile(testFile, []byte("initial\n"), 0644); err != nil {
		t.Fatalf("failed to write test file: %v", err)
	}

	cmd := exec.Command("git", "add", "initial.txt")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to git add: %v", err)
	}

	cmd = exec.Command("git", "commit", "-m", "initial commit")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to commit: %v", err)
	}

	// Add another committed change on master
	committedFile := filepath.Join(tmpDir, "committed.txt")
	if err := os.WriteFile(committedFile, []byte("committed on master\n"), 0644); err != nil {
		t.Fatalf("failed to write committed file: %v", err)
	}

	cmd = exec.Command("git", "add", "committed.txt")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to git add: %v", err)
	}

	cmd = exec.Command("git", "commit", "-m", "committed change on master")
	cmd.Dir = tmpDir
	if err := cmd.Run(); err != nil {
		t.Fatalf("failed to commit: %v", err)
	}

	// Add uncommitted change on master
	uncommittedFile := filepath.Join(tmpDir, "uncommitted.txt")
	if err := os.WriteFile(uncommittedFile, []byte("uncommitted on master\n"), 0644); err != nil {
		t.Fatalf("failed to write uncommitted file: %v", err)
	}

	oldDir, _ := os.Getwd()
	defer os.Chdir(oldDir)

	if err := os.Chdir(tmpDir); err != nil {
		t.Fatalf("failed to chdir: %v", err)
	}

	req := httptest.NewRequest("GET", "/", nil)
	req.Header.Set("Accept", "text/x-diff")

	w := httptest.NewRecorder()
	diffsHandler(w, req)

	resp := w.Result()
	if resp.StatusCode != http.StatusOK {
		t.Errorf("expected status 200, got %d", resp.StatusCode)
	}

	body := w.Body.String()

	// Should NOT show committed changes (committed.txt was committed, so should not appear in diff)
	// Look for "a/./committed.txt" or "b/./committed.txt" in diff headers
	if strings.Contains(body, "a/./committed.txt") || strings.Contains(body, "b/./committed.txt") {
		t.Errorf("should not show committed.txt changes on master branch since it was already committed, got: %s", body)
	}
	// Should show uncommitted changes
	if !strings.Contains(body, "uncommitted.txt") {
		t.Errorf("expected uncommitted.txt in diff (uncommitted change), got: %s", body)
	}
}