diff options
author | Giorgio Previtera <gprevitera@equalexperts.com> | 2019-07-13 14:50:52 +0100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-07-27 11:05:23 +1000 |
commit | 504d5065756a8bdd95f8e0362fd59cb882e5adce (patch) | |
tree | 5ee45e2943cce80e45694d28c6ebfa352a3a6f92 /pkg/commands/git_test.go | |
parent | 823b436b5388bd7321f14d22f7555dc974e61dad (diff) |
477 Add new `NeedReset` property to File and update tests
Use a boolean to determin if a file needs to be reset. We want to reset
the file when discrading changes if there is a conflict.
Diffstat (limited to 'pkg/commands/git_test.go')
-rw-r--r-- | pkg/commands/git_test.go | 113 |
1 files changed, 67 insertions, 46 deletions
diff --git a/pkg/commands/git_test.go b/pkg/commands/git_test.go index 35e97b181..55b771109 100644 --- a/pkg/commands/git_test.go +++ b/pkg/commands/git_test.go @@ -356,56 +356,77 @@ func TestGitCommandGetStatusFiles(t *testing.T) { func(cmd string, args ...string) *exec.Cmd { return exec.Command( "echo", - "MM file1.txt\nA file3.txt\nAM file2.txt\n?? file4.txt", + "MM file1.txt\nA file3.txt\nAM file2.txt\n?? file4.txt\nUU file5.txt", ) }, func(files []*File) { - assert.Len(t, files, 4) + assert.Len(t, files, 5) expected := []*File{ { - Name: "file1.txt", - HasStagedChanges: true, - HasUnstagedChanges: true, - Tracked: true, - Deleted: false, - HasMergeConflicts: false, - DisplayString: "MM file1.txt", - Type: "other", - ShortStatus: "MM", + Name: "file1.txt", + HasStagedChanges: true, + HasUnstagedChanges: true, + Tracked: true, + Deleted: false, + HasMergeConflicts: false, + HasInlineMergeConflicts: false, + NeedReset: true, + DisplayString: "MM file1.txt", + Type: "other", + ShortStatus: "MM", }, { - Name: "file3.txt", - HasStagedChanges: true, - HasUnstagedChanges: false, - Tracked: false, - Deleted: false, - HasMergeConflicts: false, - DisplayString: "A file3.txt", - Type: "other", - ShortStatus: "A ", + Name: "file3.txt", + HasStagedChanges: true, + HasUnstagedChanges: false, + Tracked: false, + Deleted: false, + HasMergeConflicts: false, + HasInlineMergeConflicts: false, + NeedReset: true, + DisplayString: "A file3.txt", + Type: "other", + ShortStatus: "A ", }, { - Name: "file2.txt", - HasStagedChanges: true, - HasUnstagedChanges: true, - Tracked: false, - Deleted: false, - HasMergeConflicts: false, - DisplayString: "AM file2.txt", - Type: "other", - ShortStatus: "AM", + Name: "file2.txt", + HasStagedChanges: true, + HasUnstagedChanges: true, + Tracked: false, + Deleted: false, + HasMergeConflicts: false, + HasInlineMergeConflicts: false, + NeedReset: true, + DisplayString: "AM file2.txt", + Type: "other", + ShortStatus: "AM", }, { - Name: "file4.txt", - HasStagedChanges: false, - HasUnstagedChanges: true, - Tracked: false, - Deleted: false, - HasMergeConflicts: false, - DisplayString: "?? file4.txt", - Type: "other", - ShortStatus: "??", + Name: "file4.txt", + HasStagedChanges: false, + HasUnstagedChanges: true, + Tracked: false, + Deleted: false, + HasMergeConflicts: false, + HasInlineMergeConflicts: false, + NeedReset: false, + DisplayString: "?? file4.txt", + Type: "other", + ShortStatus: "??", + }, + { + Name: "file5.txt", + HasStagedChanges: false, + HasUnstagedChanges: true, + Tracked: true, + Deleted: false, + HasMergeConflicts: true, + HasInlineMergeConflicts: true, + NeedReset: true, + DisplayString: "UU file5.txt", + Type: "other", + ShortStatus: "UU", }, } @@ -1195,8 +1216,8 @@ func TestGitCommandDiscardAllFileChanges(t *testing.T) { }) }, &File{ - Name: "test", - HasStagedChanges: true, + Name: "test", + NeedReset: true, }, func(string) error { return nil @@ -1296,9 +1317,9 @@ func TestGitCommandDiscardAllFileChanges(t *testing.T) { }) }, &File{ - Name: "test", - Tracked: true, - HasStagedChanges: true, + Name: "test", + Tracked: true, + NeedReset: true, }, func(string) error { return nil @@ -1322,9 +1343,9 @@ func TestGitCommandDiscardAllFileChanges(t *testing.T) { }) }, &File{ - Name: "test", - Tracked: false, - HasStagedChanges: true, + Name: "test", + Tracked: false, + NeedReset: true, }, func(filename string) error { assert.Equal(t, "test", filename) |