From bb705d91a44bfe877edb40dbf4d4f164ad923d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= Date: Sun, 22 Oct 2023 12:00:22 +0200 Subject: [PATCH] Rename integration test "ResetUpstream" We are unsetting upstream in it, not resetting to upstream --- .../tests/branch/{reset_upstream.go => unset_upstream.go} | 2 +- pkg/integration/tests/test_list.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkg/integration/tests/branch/{reset_upstream.go => unset_upstream.go} (94%) diff --git a/pkg/integration/tests/branch/reset_upstream.go b/pkg/integration/tests/branch/unset_upstream.go similarity index 94% rename from pkg/integration/tests/branch/reset_upstream.go rename to pkg/integration/tests/branch/unset_upstream.go index 70300c312..c38c0cd58 100644 --- a/pkg/integration/tests/branch/reset_upstream.go +++ b/pkg/integration/tests/branch/unset_upstream.go @@ -5,7 +5,7 @@ import ( . "github.com/jesseduffield/lazygit/pkg/integration/components" ) -var ResetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ +var UnsetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Reset the upstream of a branch", ExtraCmdArgs: []string{}, Skip: false, diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go index cea838380..5716507f8 100644 --- a/pkg/integration/tests/test_list.go +++ b/pkg/integration/tests/test_list.go @@ -52,10 +52,10 @@ var tests = []*components.IntegrationTest{ branch.Rename, branch.Reset, branch.ResetToUpstream, - branch.ResetUpstream, branch.SetUpstream, branch.ShowDivergenceFromUpstream, branch.Suggestions, + branch.UnsetUpstream, cherry_pick.CherryPick, cherry_pick.CherryPickConflicts, cherry_pick.CherryPickDuringRebase,