File tree Expand file tree Collapse file tree 4 files changed +7
-7
lines changed
pkg/integration/tests/cherry_pick Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -73,7 +73,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
73
73
t .Views ().Information ().Content (DoesNotContain ("commits copied" ))
74
74
}).
75
75
Lines (
76
- Contains ("four" ),
76
+ Contains ("four" ). IsSelected () ,
77
77
Contains ("three" ),
78
78
Contains ("two" ),
79
79
Contains ("one" ),
@@ -102,7 +102,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
102
102
t .Views ().Information ().Content (DoesNotContain ("commits copied" ))
103
103
}).
104
104
Lines (
105
- Contains ("four" ),
105
+ Contains ("four" ). IsSelected () ,
106
106
Contains ("three" ),
107
107
Contains ("base" ),
108
108
)
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
43
43
t .Views ().Commits ().
44
44
Focus ().
45
45
TopLines (
46
- Contains ("first change" ),
46
+ Contains ("first change" ). IsSelected () ,
47
47
).
48
48
Press (keys .Commits .PasteCommits )
49
49
@@ -76,7 +76,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
76
76
t .Views ().Commits ().
77
77
Focus ().
78
78
TopLines (
79
- Contains ("second-change-branch unrelated change" ),
79
+ Contains ("second-change-branch unrelated change" ). IsSelected () ,
80
80
Contains ("second change" ),
81
81
Contains ("first change" ),
82
82
).
Original file line number Diff line number Diff line change @@ -79,7 +79,7 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
79
79
Contains ("--- Pending rebase todos ---" ),
80
80
Contains ("pick CI two" ),
81
81
Contains ("--- Commits ---" ),
82
- Contains (" CI three" ),
82
+ Contains (" CI three" ). IsSelected () ,
83
83
Contains (" CI one" ),
84
84
Contains (" CI base" ),
85
85
).
@@ -88,7 +88,7 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
88
88
}).
89
89
Lines (
90
90
Contains ("CI two" ),
91
- Contains ("CI three" ),
91
+ Contains ("CI three" ). IsSelected () ,
92
92
Contains ("CI one" ),
93
93
Contains ("CI base" ),
94
94
)
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ var CherryPickRange = NewIntegrationTest(NewIntegrationTestArgs{
70
70
t .Views ().Information ().Content (DoesNotContain ("commits copied" ))
71
71
}).
72
72
Lines (
73
- Contains ("four" ),
73
+ Contains ("four" ). IsSelected () ,
74
74
Contains ("three" ),
75
75
Contains ("two" ),
76
76
Contains ("one" ),
You can’t perform that action at this time.
0 commit comments