From 05030aa565366efaf484569ce79cd83078ac908f Mon Sep 17 00:00:00 2001 From: Andy Stewart Date: Thu, 5 Mar 2015 11:43:39 +0100 Subject: [PATCH] Add test for staging subsequent nearby hunk. --- test/helper.vim | 5 +++++ test/hunkStageNearbyGitDiff.expected | 13 +++++++++++++ test/hunkStageNearbyGitDiffStaged.expected | 12 ++++++++++++ test/hunkStageNearbySigns.expected | 6 ++++++ test/testHunkStageNearbyHunk.vim | 10 ++++++++++ 5 files changed, 46 insertions(+) create mode 100644 test/hunkStageNearbyGitDiff.expected create mode 100644 test/hunkStageNearbyGitDiffStaged.expected create mode 100644 test/hunkStageNearbySigns.expected create mode 100644 test/testHunkStageNearbyHunk.vim diff --git a/test/helper.vim b/test/helper.vim index da087e2..003a2ac 100644 --- a/test/helper.vim +++ b/test/helper.vim @@ -12,6 +12,11 @@ function! DumpSigns(filename) redir END endfunction +function! DumpGitDiff(filename) + call system('git diff fixture.txt > '.a:filename.'.actual') +endfunction + function! DumpGitDiffStaged(filename) call system('git diff --staged fixture.txt > '.a:filename.'.actual') endfunction + diff --git a/test/hunkStageNearbyGitDiff.expected b/test/hunkStageNearbyGitDiff.expected new file mode 100644 index 0000000..6a0b7f0 --- /dev/null +++ b/test/hunkStageNearbyGitDiff.expected @@ -0,0 +1,13 @@ +diff --git a/test/fixture.txt b/test/fixture.txt +index 53b13df..8fdfda7 100644 +--- a/test/fixture.txt ++++ b/test/fixture.txt +@@ -1,5 +1,8 @@ + a + b ++x ++y ++z + c + e + f diff --git a/test/hunkStageNearbyGitDiffStaged.expected b/test/hunkStageNearbyGitDiffStaged.expected new file mode 100644 index 0000000..8806576 --- /dev/null +++ b/test/hunkStageNearbyGitDiffStaged.expected @@ -0,0 +1,12 @@ +diff --git a/test/fixture.txt b/test/fixture.txt +index f5c6aff..53b13df 100644 +--- a/test/fixture.txt ++++ b/test/fixture.txt +@@ -1,7 +1,6 @@ + a + b + c +-d + e + f + g diff --git a/test/hunkStageNearbySigns.expected b/test/hunkStageNearbySigns.expected new file mode 100644 index 0000000..edfebd2 --- /dev/null +++ b/test/hunkStageNearbySigns.expected @@ -0,0 +1,6 @@ + +--- Signs --- +Signs for fixture.txt: + line=3 id=3000 name=GitGutterLineAdded + line=4 id=3001 name=GitGutterLineAdded + line=5 id=3002 name=GitGutterLineAdded diff --git a/test/testHunkStageNearbyHunk.vim b/test/testHunkStageNearbyHunk.vim new file mode 100644 index 0000000..9939103 --- /dev/null +++ b/test/testHunkStageNearbyHunk.vim @@ -0,0 +1,10 @@ +source helper.vim +call Setup() + +execute "normal! 2Gox\y\z" +normal 2jdd +normal k +execute 'GitGutterStageHunk' +call DumpSigns('hunkStageNearbySigns') +call DumpGitDiff('hunkStageNearbyGitDiff') +call DumpGitDiffStaged('hunkStageNearbyGitDiffStaged')