ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

chore: rename "Set/Unset upstream" menu to "Upstream Options"

Browse Source 
This should already have been done when adding the "View divergence from
upstream" command, but now we're going to add yet another item to the menu that
is unrelated to setting or unsetting the upstream.
This commit is contained in:
AzraelSec
2023-08-27 14:02:13 +02:00
committed by AzraelSec
parent a3cd1e93be
commit 47d422bb8a
16 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/integration/tests/branch/reset_upstream.go
View File

@@ -25,7 +25,7 @@ var ResetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.SetUpstream).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Set/Unset upstream")).
Title(Equals("Upstream options")).
Select(Contains("Unset upstream of selected branch")).
Confirm()
}).

2
pkg/integration/tests/branch/set_upstream.go
View File

@@ -24,7 +24,7 @@ var SetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.SetUpstream).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Set/Unset upstream")).
Title(Equals("Upstream options")).
Select(Contains(" Set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option
Confirm()

2
pkg/integration/tests/branch/show_divergence_from_upstream.go
View File

@@ -38,7 +38,7 @@ var ShowDivergenceFromUpstream = NewIntegrationTest(NewIntegrationTestArgs{
Lines(Contains("master")).
Press(keys.Branches.SetUpstream)
t.ExpectPopup().Menu().Title(Contains("upstream")).Select(Contains("View divergence from upstream")).Confirm()
t.ExpectPopup().Menu().Title(Contains("Upstream")).Select(Contains("View divergence from upstream")).Confirm()
t.Views().SubCommits().
IsFocused().