Skip to content

Commit 0b5504a

Browse files
stefanhallerstefanhaller
committed
Cleanup: make integration test assertions for files panel more specific
Assert the entire lines using Equals instead of Contains. This makes the tests a bit easier to read, and it makes it much easier to decide how they need to be changed when we change the layout (like we do in the last commit of this branch). It is true that this requires changing all these tests for any future UI changes, but I think this is a good price to pay; those adaptions are trivial and can be done without thinking.
1 parent 030c2e5 commit 0b5504a

38 files changed

+358
-358
lines changed

‎pkg/integration/tests/branch/reset_to_upstream.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ var ResetToUpstream = NewIntegrationTest(NewIntegrationTestArgs{
7272
Contains("hard commit"),
7373
)
7474
t.Views().Files().Lines(
75-
Contains("file-1").Contains("A"),
76-
Contains("file-2").Contains("A"),
75+
Equals("A file-1"),
76+
Equals("A file-2"),
7777
)
7878

7979
// hard reset

‎pkg/integration/tests/commit/commit.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ var Commit = NewIntegrationTest(NewIntegrationTestArgs{
2121
t.Views().Files().
2222
IsFocused().
2323
Lines(
24-
Contains("?? myfile").IsSelected(),
25-
Contains("?? myfile2"),
24+
Equals("?? myfile").IsSelected(),
25+
Equals("?? myfile2"),
2626
).
2727
PressPrimaryAction(). // stage file
2828
Lines(
29-
Contains("A myfile").IsSelected(),
30-
Contains("?? myfile2"),
29+
Equals("A myfile").IsSelected(),
30+
Equals("?? myfile2"),
3131
).
3232
SelectNextItem().
3333
PressPrimaryAction(). // stage other file
3434
Lines(
35-
Contains("A myfile"),
36-
Contains("A myfile2").IsSelected(),
35+
Equals("A myfile"),
36+
Equals("A myfile2").IsSelected(),
3737
).
3838
Press(keys.Files.CommitChanges)
3939

@@ -54,8 +54,8 @@ var Commit = NewIntegrationTest(NewIntegrationTestArgs{
5454
t.Views().CommitFiles().
5555
IsFocused().
5656
Lines(
57-
Contains("A myfile"),
58-
Contains("A myfile2"),
57+
Equals("A myfile"),
58+
Equals("A myfile2"),
5959
)
6060
},
6161
})

‎pkg/integration/tests/commit/discard_old_file_changes.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
4343
t.Views().CommitFiles().
4444
IsFocused().
4545
Lines(
46-
Contains("dir1").IsSelected(),
47-
Contains("subd1"),
48-
Contains("subfile0"),
49-
Contains("d1_file0"),
50-
Contains("dir2"),
51-
Contains("d2_file1"),
52-
Contains("d2_file2"),
46+
Equals("▼ dir1").IsSelected(),
47+
Equals(" ▼ subd1"),
48+
Equals(" A subfile0"),
49+
Equals(" A d1_file0"),
50+
Equals("▼ dir2"),
51+
Equals(" A d2_file1"),
52+
Equals(" A d2_file2"),
5353
).
5454
NavigateToLine(Contains("d1_file0")).
5555
Press(keys.Universal.Remove)
@@ -62,11 +62,11 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
6262
t.Views().CommitFiles().
6363
IsFocused().
6464
Lines(
65-
Contains("dir1/subd1"),
66-
Contains("subfile0"),
67-
Contains("dir2"),
68-
Contains("d2_file1").IsSelected(),
69-
Contains("d2_file2"),
65+
Equals("▼ dir1/subd1"),
66+
Equals(" A subfile0"),
67+
Equals("▼ dir2"),
68+
Equals(" A d2_file1").IsSelected(),
69+
Equals(" A d2_file2"),
7070
).
7171
PressEscape()
7272

@@ -84,11 +84,11 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
8484
t.Views().CommitFiles().
8585
IsFocused().
8686
Lines(
87-
Contains("dir2").IsSelected(),
88-
Contains("d2_file1"),
89-
Contains("d2_file2"),
90-
Contains("d2_file3"),
91-
Contains("d2_file4"),
87+
Equals("▼ dir2").IsSelected(),
88+
Equals(" M d2_file1"),
89+
Equals(" D d2_file2"),
90+
Equals(" A d2_file3"),
91+
Equals(" A d2_file4"),
9292
).
9393
NavigateToLine(Contains("d2_file1")).
9494
Press(keys.Universal.ToggleRangeSelect).
@@ -122,11 +122,11 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
122122
t.Views().CommitFiles().
123123
IsFocused().
124124
Lines(
125-
Contains("dir1").IsSelected(),
126-
Contains("subd1"),
127-
Contains("file2ToRemove"),
128-
Contains("fileToRemove"),
129-
Contains("multiLineFile"),
125+
Equals("▼ dir1").IsSelected(),
126+
Equals(" ▼ subd1"),
127+
Equals(" A file2ToRemove"),
128+
Equals(" A fileToRemove"),
129+
Equals(" A multiLineFile"),
130130
).
131131
NavigateToLine(Contains("multiLineFile")).
132132
PressEnter()
@@ -142,11 +142,11 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
142142
t.Views().CommitFiles().
143143
IsFocused().
144144
Lines(
145-
Contains("dir1"),
146-
Contains("subd1"),
147-
Contains("file2ToRemove"),
148-
Contains("fileToRemove"),
149-
Contains("multiLineFile").IsSelected(),
145+
Equals("▼ dir1"),
146+
Equals(" ▼ subd1"),
147+
Equals(" A file2ToRemove"),
148+
Equals(" A fileToRemove"),
149+
Equals(" ◐ multiLineFile").IsSelected(),
150150
).
151151
NavigateToLine(Contains("dir1")).
152152
Press(keys.Universal.ToggleRangeSelect).

‎pkg/integration/tests/conflicts/filter.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ var Filter = NewIntegrationTest(NewIntegrationTestArgs{
1818
t.Views().Files().
1919
IsFocused().
2020
Lines(
21-
Contains("UU").Contains("file1").IsSelected(),
22-
Contains("UU").Contains("file2"),
21+
Equals("UU file1").IsSelected(),
22+
Equals("UU file2"),
2323
).
2424
Press(keys.Files.OpenStatusFilter).
2525
Tap(func() {
@@ -29,10 +29,10 @@ var Filter = NewIntegrationTest(NewIntegrationTestArgs{
2929
Confirm()
3030
}).
3131
Lines(
32-
Contains("UU").Contains("file1").IsSelected(),
33-
Contains("UU").Contains("file2"),
32+
Equals("UU file1").IsSelected(),
33+
Equals("UU file2"),
3434
// now we see the non-merge conflict file
35-
Contains("A ").Contains("file3"),
35+
Equals("A file3"),
3636
)
3737
},
3838
})

‎pkg/integration/tests/conflicts/resolve_multiple_files.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{
1818
t.Views().Files().
1919
IsFocused().
2020
Lines(
21-
Contains("UU").Contains("file1").IsSelected(),
22-
Contains("UU").Contains("file2"),
21+
Equals("UU file1").IsSelected(),
22+
Equals("UU file2"),
2323
).
2424
PressEnter()
2525

@@ -35,7 +35,7 @@ var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{
3535
t.Views().Files().
3636
IsFocused().
3737
Lines(
38-
Contains("UU").Contains("file2").IsSelected(),
38+
Equals("UU file2").IsSelected(),
3939
).
4040
PressEnter()
4141

‎pkg/integration/tests/conflicts/resolve_no_auto_stage.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ var ResolveNoAutoStage = NewIntegrationTest(NewIntegrationTestArgs{
2020
t.Views().Files().
2121
IsFocused().
2222
Lines(
23-
Contains("UU").Contains("file1").IsSelected(),
24-
Contains("UU").Contains("file2"),
23+
Equals("UU file1").IsSelected(),
24+
Equals("UU file2"),
2525
).
2626
PressEnter()
2727

@@ -38,13 +38,13 @@ var ResolveNoAutoStage = NewIntegrationTest(NewIntegrationTestArgs{
3838
IsFocused().
3939
// Resolving the conflict didn't auto-stage it
4040
Lines(
41-
Contains("UU").Contains("file1").IsSelected(),
42-
Contains("UU").Contains("file2"),
41+
Equals("UU file1").IsSelected(),
42+
Equals("UU file2"),
4343
).
4444
// So do that manually
4545
PressPrimaryAction().
4646
Lines(
47-
Contains("UU").Contains("file2").IsSelected(),
47+
Equals("UU file2").IsSelected(),
4848
).
4949
// Trying to stage a file that still has conflicts is not allowed:
5050
PressPrimaryAction().
@@ -70,12 +70,12 @@ var ResolveNoAutoStage = NewIntegrationTest(NewIntegrationTestArgs{
7070
IsFocused().
7171
// Again, resolving the conflict didn't auto-stage it
7272
Lines(
73-
Contains("UU").Contains("file2").IsSelected(),
73+
Equals("UU file2").IsSelected(),
7474
).
7575
// Doing that manually now works:
7676
PressPrimaryAction().
7777
Lines(
78-
Contains("A").Contains("file3").IsSelected(),
78+
Equals("A file3").IsSelected(),
7979
)
8080
},
8181
})

‎pkg/integration/tests/file/collapse_expand.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,26 @@ var CollapseExpand = NewIntegrationTest(NewIntegrationTestArgs{
2121
t.Views().Files().
2222
IsFocused().
2323
Lines(
24-
Contains("dir").IsSelected(),
25-
Contains("??").Contains("file-one"),
26-
Contains("dir2"),
27-
Contains("??").Contains("file-two"),
24+
Equals("▼ dir").IsSelected(),
25+
Equals(" ?? file-one"),
26+
Equals("▼ dir2"),
27+
Equals(" ?? file-two"),
2828
)
2929

3030
t.Views().Files().
3131
Press(keys.Files.CollapseAll).
3232
Lines(
33-
Contains("dir"),
34-
Contains("dir2"),
33+
Equals("▶ dir"),
34+
Equals("▶ dir2"),
3535
)
3636

3737
t.Views().Files().
3838
Press(keys.Files.ExpandAll).
3939
Lines(
40-
Contains("dir").IsSelected(),
41-
Contains("??").Contains("file-one"),
42-
Contains("dir2"),
43-
Contains("??").Contains("file-two"),
40+
Equals("▼ dir").IsSelected(),
41+
Equals(" ?? file-one"),
42+
Equals("▼ dir2"),
43+
Equals(" ?? file-two"),
4444
)
4545
},
4646
})

‎pkg/integration/tests/file/discard_range_select.go

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,33 @@ var DiscardRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
2929
t.Views().Files().
3030
IsFocused().
3131
Lines(
32-
Contains("▼ dir1").IsSelected(),
33-
Contains(" ??").Contains("file-1a"),
34-
Contains(" ??").Contains("file-1b"),
35-
Contains("▼ dir2"),
36-
Contains(" ??").Contains("file-2a"),
37-
Contains(" M").Contains("file-2b"),
38-
Contains("▼ dir3"),
39-
Contains(" ??").Contains("file-3a"),
40-
Contains(" M").Contains("file-3b"),
41-
Contains("??").Contains("file-a"),
42-
Contains("??").Contains("file-b"),
32+
Equals("▼ dir1").IsSelected(),
33+
Equals(" ?? file-1a"),
34+
Equals(" ?? file-1b"),
35+
Equals("▼ dir2"),
36+
Equals(" ?? file-2a"),
37+
Equals(" M file-2b"),
38+
Equals("▼ dir3"),
39+
Equals(" ?? file-3a"),
40+
Equals(" M file-3b"),
41+
Equals("?? file-a"),
42+
Equals("?? file-b"),
4343
).
4444
NavigateToLine(Contains("file-1b")).
4545
Press(keys.Universal.ToggleRangeSelect).
4646
NavigateToLine(Contains("file-2a")).
4747
Lines(
48-
Contains("▼ dir1"),
49-
Contains(" ??").Contains("file-1a"),
50-
Contains(" ??").Contains("file-1b").IsSelected(),
51-
Contains("▼ dir2").IsSelected(),
52-
Contains(" ??").Contains("file-2a").IsSelected(),
53-
Contains(" M").Contains("file-2b"),
54-
Contains("▼ dir3"),
55-
Contains(" ??").Contains("file-3a"),
56-
Contains(" M").Contains("file-3b"),
57-
Contains("??").Contains("file-a"),
58-
Contains("??").Contains("file-b"),
48+
Equals("▼ dir1"),
49+
Equals(" ?? file-1a"),
50+
Equals(" ?? file-1b").IsSelected(),
51+
Equals("▼ dir2").IsSelected(),
52+
Equals(" ?? file-2a").IsSelected(),
53+
Equals(" M file-2b"),
54+
Equals("▼ dir3"),
55+
Equals(" ?? file-3a"),
56+
Equals(" M file-3b"),
57+
Equals("?? file-a"),
58+
Equals("?? file-b"),
5959
).
6060
// Discard
6161
Press(keys.Universal.Remove).
@@ -66,24 +66,24 @@ var DiscardRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
6666
Confirm()
6767
}).
6868
Lines(
69-
Contains("▼ dir1"),
70-
Contains(" ??").Contains("file-1a"),
71-
Contains("▼ dir3").IsSelected(),
72-
Contains(" ??").Contains("file-3a"),
73-
Contains(" M").Contains("file-3b"),
74-
Contains("??").Contains("file-a"),
75-
Contains("??").Contains("file-b"),
69+
Equals("▼ dir1"),
70+
Equals(" ?? file-1a"),
71+
Equals("▼ dir3").IsSelected(),
72+
Equals(" ?? file-3a"),
73+
Equals(" M file-3b"),
74+
Equals("?? file-a"),
75+
Equals("?? file-b"),
7676
).
7777
// Verify you can discard collapsed directories in range select
7878
PressEnter().
7979
Press(keys.Universal.ToggleRangeSelect).
8080
NavigateToLine(Contains("file-a")).
8181
Lines(
82-
Contains("▼ dir1"),
83-
Contains(" ??").Contains("file-1a"),
84-
Contains("▶ dir3").IsSelected(),
85-
Contains("??").Contains("file-a").IsSelected(),
86-
Contains("??").Contains("file-b"),
82+
Equals("▼ dir1"),
83+
Equals(" ?? file-1a"),
84+
Equals("▶ dir3").IsSelected(),
85+
Equals("?? file-a").IsSelected(),
86+
Equals("?? file-b"),
8787
).
8888
Press(keys.Universal.Remove).
8989
Tap(func() {
@@ -93,9 +93,9 @@ var DiscardRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
9393
Confirm()
9494
}).
9595
Lines(
96-
Contains("▼ dir1"),
97-
Contains(" ??").Contains("file-1a"),
98-
Contains("??").Contains("file-b").IsSelected(),
96+
Equals("▼ dir1"),
97+
Equals(" ?? file-1a"),
98+
Equals("?? file-b").IsSelected(),
9999
)
100100
},
101101
})

0 commit comments

Comments
 (0)