package gui import ( "testing" "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/patch" "github.com/stretchr/testify/assert" ) const diffForTest = `diff --git a/pkg/gui/diff_context_size.go b/pkg/gui/diff_context_size.go index 0da0a982..742b7dcf 100644 --- a/pkg/gui/diff_context_size.go +++ b/pkg/gui/diff_context_size.go @@ -9,12 +9,12 @@ func getRefreshFunction(gui *Gui) func()error { } } else if key == MAIN_STAGING_CONTEXT_KEY { return func() error { - selectedLine := gui.Views.Secondary.SelectedLineIdx() + selectedLine := gui.State.Panels.LineByLine.GetSelectedLineIdx() return gui.handleRefreshStagingPanel(false, selectedLine) } } else if key == MAIN_PATCH_BUILDING_CONTEXT_KEY { ` func setupGuiForTest(gui *Gui) { gui.g = &gocui.Gui{} gui.Views.Main, _ = gui.prepareView("main") gui.Views.Secondary, _ = gui.prepareView("secondary") gui.GitCommand.PatchManager = &patch.PatchManager{} _, _ = gui.refreshLineByLinePanel(diffForTest, "", false, 11) } func TestIncreasesContextInDiffViewByOneInContextWithDiff(t *testing.T) { contexts := []func(gui *Gui) Context{ func(gui *Gui) Context { return gui.State.Contexts.Files }, func(gui *Gui) Context { return gui.State.Contexts.BranchCommits }, func(gui *Gui) Context { return gui.State.Contexts.CommitFiles }, func(gui *Gui) Context { return gui.State.Contexts.Stash }, func(gui *Gui) Context { return gui.State.Contexts.Staging }, func(gui *Gui) Context { return gui.State.Contexts.PatchBuilding }, func(gui *Gui) Context { return gui.State.Contexts.SubCommits }, } for _, c := range contexts { gui := NewDummyGui() context := c(gui) setupGuiForTest(gui) gui.Config.GetUserConfig().Git.DiffContextSize = 1 _ = gui.pushContextDirect(context) _ = gui.IncreaseContextInDiffView() assert.Equal(t, 2, gui.Config.GetUserConfig().Git.DiffContextSize, string(context.GetKey())) } } func TestDoesntIncreaseContextInDiffViewInContextWithoutDiff(t *testing.T) { contexts := []func(gui *Gui) Context{ func(gui *Gui) Context { return gui.State.Contexts.Status }, func(gui *Gui) Context { return gui.State.Contexts.Submodules }, func(gui *Gui) Context { return gui.State.Contexts.Remotes }, func(gui *Gui) Context { return gui.State.Contexts.Normal }, func(gui *Gui) Context { return gui.State.Contexts.ReflogCommits }, func(gui *Gui) Context { return gui.State.Contexts.RemoteBranches }, func(gui *Gui) Context { return gui.State.Contexts.Tags }, func(gui *Gui) Context { return gui.State.Contexts.Merging }, func(gui *Gui) Context { return gui.State.Contexts.CommandLog }, } for _, c := range contexts { gui := NewDummyGui() context := c(gui) setupGuiForTest(gui) gui.Config.GetUserConfig().Git.DiffContextSize = 1 _ = gui.pushContextDirect(context) _ = gui.IncreaseContextInDiffView() assert.Equal(t, 1, gui.Config.GetUserConfig().Git.DiffContextSize, string(context.GetKey())) } } func TestDecreasesContextInDiffViewByOneInContextWithDiff(t *testing.T) { contexts := []func(gui *Gui) Context{ func(gui *Gui) Context { return gui.State.Contexts.Files }, func(gui *Gui) Context { return gui.State.Contexts.BranchCommits }, func(gui *Gui) Context { return gui.State.Contexts.CommitFiles }, func(gui *Gui) Context { return gui.State.Contexts.Stash }, func(gui *Gui) Context { return gui.State.Contexts.Staging }, func(gui *Gui) Context { return gui.State.Contexts.PatchBuilding }, func(gui *Gui) Context { return gui.State.Contexts.SubCommits }, } for _, c := range contexts { gui := NewDummyGui() context := c(gui) setupGuiForTest(gui) gui.Config.GetUserConfig().Git.DiffContextSize = 2 _ = gui.pushContextDirect(context) _ = gui.DecreaseContextInDiffView() assert.Equal(t, 1, gui.Config.GetUserConfig().Git.DiffContextSize, string(context.GetKey())) } } func TestDoesntDecreaseContextInDiffViewInContextWithoutDiff(t *testing.T) { contexts := []func(gui *Gui) Context{ func(gui *Gui) Context { return gui.State.Contexts.Status }, func(gui *Gui) Context { return gui.State.Contexts.Submodules }, func(gui *Gui) Context { return gui.State.Contexts.Remotes }, func(gui *Gui) Context { return gui.State.Contexts.Normal }, func(gui *Gui) Context { return gui.State.Contexts.ReflogCommits }, func(gui *Gui) Context { return gui.State.Contexts.RemoteBranches }, func(gui *Gui) Context { return gui.State.Contexts.Tags }, func(gui *Gui) Context { return gui.State.Contexts.Merging }, func(gui *Gui) Context { return gui.State.Contexts.CommandLog }, } for _, c := range contexts { gui := NewDummyGui() context := c(gui) setupGuiForTest(gui) gui.Config.GetUserConfig().Git.DiffContextSize = 2 _ = gui.pushContextDirect(context) _ = gui.DecreaseContextInDiffView() assert.Equal(t, 2, gui.Config.GetUserConfig().Git.DiffContextSize, string(context.GetKey())) } } func TestDoesntIncreaseContextInDiffViewInContextWhenInPatchBuildingMode(t *testing.T) { gui := NewDummyGui() setupGuiForTest(gui) gui.Config.GetUserConfig().Git.DiffContextSize = 2 _ = gui.pushContextDirect(gui.State.Contexts.CommitFiles) gui.GitCommand.PatchManager.Start("from", "to", false, false) errorCount := 0 gui.PopupHandler = &TestPopupHandler{ onError: func(message string) error { assert.Equal(t, gui.Tr.CantChangeContextSizeError, message) errorCount += 1 return nil }, } _ = gui.IncreaseContextInDiffView() assert.Equal(t, 1, errorCount) assert.Equal(t, 2, gui.Config.GetUserConfig().Git.DiffContextSize) } func TestDoesntDecreaseContextInDiffViewInContextWhenInPatchBuildingMode(t *testing.T) { gui := NewDummyGui() setupGuiForTest(gui) gui.Config.GetUserConfig().Git.DiffContextSize = 2 _ = gui.pushContextDirect(gui.State.Contexts.CommitFiles) gui.GitCommand.PatchManager.Start("from", "to", false, false) errorCount := 0 gui.PopupHandler = &TestPopupHandler{ onError: func(message string) error { assert.Equal(t, gui.Tr.CantChangeContextSizeError, message) errorCount += 1 return nil }, } _ = gui.DecreaseContextInDiffView() assert.Equal(t, 2, gui.Config.GetUserConfig().Git.DiffContextSize) } func TestDecreasesContextInDiffViewNoFurtherThanOne(t *testing.T) { gui := NewDummyGui() setupGuiForTest(gui) gui.Config.GetUserConfig().Git.DiffContextSize = 1 _ = gui.DecreaseContextInDiffView() assert.Equal(t, 1, gui.Config.GetUserConfig().Git.DiffContextSize) }