@@ -12,64 +12,39 @@ var StageDeletedRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
1212 SetupConfig : func (config * config.AppConfig ) {
1313 },
1414 SetupRepo : func (shell * Shell ) {
15- shell .CreateFileAndAdd ("dir1/file-a" , "" )
16- shell .CreateFileAndAdd ("dir2/file-b" , "" )
17- shell .CreateFileAndAdd ("file-c" , "" )
18- shell .CreateFileAndAdd ("file-d" , "" )
15+ shell .CreateFileAndAdd ("file-a" , "" )
16+ shell .CreateFileAndAdd ("file-b" , "" )
1917 shell .Commit ("first commit" )
2018
21- shell .DeleteFile ("dir1/file-a" )
22- shell .DeleteFile ("dir2/file-b" )
23- shell .DeleteFile ("file-c" )
24- shell .DeleteFile ("file-d" )
19+ shell .DeleteFile ("file-a" )
20+ shell .DeleteFile ("file-b" )
2521 },
2622 Run : func (t * TestDriver , keys config.KeybindingConfig ) {
2723 t .Views ().Files ().
2824 IsFocused ().
2925 Lines (
30- Contains ("▼ dir1" ).IsSelected (),
31- Contains (" D" ).Contains ("file-a" ),
32- Contains ("▼ dir2" ),
33- Contains (" D" ).Contains ("file-b" ),
34- Contains (" D" ).Contains ("file-c" ),
35- Contains (" D" ).Contains ("file-d" ),
26+ Contains (" D" ).Contains ("file-a" ).IsSelected (),
27+ Contains (" D" ).Contains ("file-b" ),
3628 ).
37- NavigateToLine (Contains ("file-b" )).
38- Press (keys .Universal .ToggleRangeSelect ).
39- NavigateToLine (Contains ("file-c" )).
40- // Stage a deleted file and nested file
29+ // Stage a single deleted file
4130 PressPrimaryAction ().
4231 Lines (
43- Contains ("▼ dir1" ),
44- Contains (" D" ).Contains ("file-a" ),
45- Contains ("▼ dir2" ),
46- Contains (" D " ).Contains ("file-b" ).IsSelected (),
47- Contains ("D " ).Contains ("file-c" ).IsSelected (),
48- Contains (" D" ).Contains ("file-d" ),
32+ Contains ("D " ).Contains ("file-a" ).IsSelected (),
33+ Contains (" D" ).Contains ("file-b" ),
4934 ).
5035 Press (keys .Universal .ToggleRangeSelect ).
51- NavigateToLine (Contains ("file-a" )).
52- Press (keys .Universal .ToggleRangeSelect ).
53- NavigateToLine (Contains ("file-d" )).
54- // Stage the entire selection of files while some deleted files are already staged
36+ NavigateToLine (Contains ("file-b" )).
37+ // Stage both files while a deleted file is already staged
5538 PressPrimaryAction ().
5639 Lines (
57- Contains ("▼ dir1" ),
58- Contains (" D " ).Contains ("file-a" ).IsSelected (),
59- Contains ("▼ dir2" ).IsSelected (),
60- Contains (" D " ).Contains ("file-b" ).IsSelected (),
61- Contains ("D " ).Contains ("file-c" ).IsSelected (),
62- Contains ("D " ).Contains ("file-d" ).IsSelected (),
40+ Contains ("D " ).Contains ("file-a" ).IsSelected (),
41+ Contains ("D " ).Contains ("file-b" ).IsSelected (),
6342 ).
6443 // Unstage; back to everything being unstaged
6544 PressPrimaryAction ().
6645 Lines (
67- Contains ("▼ dir1" ),
68- Contains (" D" ).Contains ("file-a" ).IsSelected (),
69- Contains ("▼ dir2" ).IsSelected (),
70- Contains (" D" ).Contains ("file-b" ).IsSelected (),
71- Contains (" D" ).Contains ("file-c" ).IsSelected (),
72- Contains (" D" ).Contains ("file-d" ).IsSelected (),
46+ Contains (" D" ).Contains ("file-a" ).IsSelected (),
47+ Contains (" D" ).Contains ("file-b" ).IsSelected (),
7348 )
7449 },
7550})
0 commit comments