t9500: Add basic sanity tests for side-by-side diff in gitweb
Test that side-by-side diff can deal with incomplete lines (and while at it with pure addition, pure removal, and change), and with merge commits, producing no errors or warnings. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narebski committed
Oct 31, 2011 at 00:36 UTC
1e706eccd4051f0ff52d54aaf199496cc951a7bb
1 file changed
+25
-1
t/t9500-gitweb-standalone-no-errors.sh
+25
-1
@@ -329,7 +329,8 @@ test_expect_success \
329
git add b &&
330
git commit -a -m "On branch" &&
331
git checkout master &&
332
- git pull . b'
332
+ git pull . b &&
333
+ git tag merge_commit'
334
335
test_expect_success \
336
'commit(0): merge commit' \
@@ -378,6 +379,29 @@ test_expect_success \
379
'commitdiff(1): large commit' \
380
'gitweb_run "p=.git;a=commitdiff;h=b"'
381
382
+# ----------------------------------------------------------------------
383
+# side-by-side diff
384
+
385
+test_expect_success 'side-by-side: addition of incomplete line' '
386
+ gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_add;ds=sidebyside"
387
+'
388
+
389
+test_expect_success 'side-by-side: incomplete line as context line' '
390
+ gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_ctx;ds=sidebyside"
391
+'
392
+
393
+test_expect_success 'side-by-side: changed incomplete line' '
394
+ gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_chg;ds=sidebyside"
395
+'
396
+
397
+test_expect_success 'side-by-side: removal of incomplete line' '
398
+ gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_rem;ds=sidebyside"
399
+'
400
+
401
+test_expect_success 'side-by-side: merge commit' '
402
+ gitweb_run "p=.git;a=commitdiff;h=merge_commit;ds=sidebyside"
403
+'
404
+
405
# ----------------------------------------------------------------------
406
# tags testing
407