go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-25 12:24:47 +02:00
Code Issues Releases Activity

minor changes

Browse Source
This commit is contained in:
Jesse Duffield 2022-12-28 10:23:54 +11:00
parent ed93e0a2b0
commit 06c878c051
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/integration/components/views.go
View File

@ -36,7 +36,7 @@ func (self *Views) Secondary() *View {
} }
} }
func (self *Views) ByName(viewName string) *View { func (self *Views) byName(viewName string) *View {
return &View{ return &View{
context: fmt.Sprintf("%s view", viewName), context: fmt.Sprintf("%s view", viewName),
getView: func() *gocui.View { return self.t.gui.View(viewName) }, getView: func() *gocui.View { return self.t.gui.View(viewName) },
@ -45,77 +45,77 @@ func (self *Views) ByName(viewName string) *View {
} }
func (self *Views) Commits() *View { func (self *Views) Commits() *View {
return self.ByName("commits") return self.byName("commits")
} }
func (self *Views) Files() *View { func (self *Views) Files() *View {
return self.ByName("files") return self.byName("files")
} }
func (self *Views) Status() *View { func (self *Views) Status() *View {
return self.ByName("status") return self.byName("status")
} }
func (self *Views) Submodules() *View { func (self *Views) Submodules() *View {
return self.ByName("submodules") return self.byName("submodules")
} }
func (self *Views) Information() *View { func (self *Views) Information() *View {
return self.ByName("information") return self.byName("information")
} }
func (self *Views) Branches() *View { func (self *Views) Branches() *View {
return self.ByName("localBranches") return self.byName("localBranches")
} }
func (self *Views) RemoteBranches() *View { func (self *Views) RemoteBranches() *View {
return self.ByName("remoteBranches") return self.byName("remoteBranches")
} }
func (self *Views) Tags() *View { func (self *Views) Tags() *View {
return self.ByName("tags") return self.byName("tags")
} }
func (self *Views) ReflogCommits() *View { func (self *Views) ReflogCommits() *View {
return self.ByName("reflogCommits") return self.byName("reflogCommits")
} }
func (self *Views) SubCommits() *View { func (self *Views) SubCommits() *View {
return self.ByName("subCommits") return self.byName("subCommits")
} }
func (self *Views) CommitFiles() *View { func (self *Views) CommitFiles() *View {
return self.ByName("commitFiles") return self.byName("commitFiles")
} }
func (self *Views) Stash() *View { func (self *Views) Stash() *View {
return self.ByName("stash") return self.byName("stash")
} }
func (self *Views) Staging() *View { func (self *Views) Staging() *View {
return self.ByName("staging") return self.byName("staging")
} }
func (self *Views) StagingSecondary() *View { func (self *Views) StagingSecondary() *View {
return self.ByName("stagingSecondary") return self.byName("stagingSecondary")
} }
func (self *Views) Menu() *View { func (self *Views) Menu() *View {
return self.ByName("menu") return self.byName("menu")
} }
func (self *Views) Confirmation() *View { func (self *Views) Confirmation() *View {
return self.ByName("confirmation") return self.byName("confirmation")
} }
func (self *Views) CommitMessage() *View { func (self *Views) CommitMessage() *View {
return self.ByName("commitMessage") return self.byName("commitMessage")
} }
func (self *Views) Suggestions() *View { func (self *Views) Suggestions() *View {
return self.ByName("suggestions") return self.byName("suggestions")
} }
func (self *Views) MergeConflicts() *View { func (self *Views) MergeConflicts() *View {
return self.ByName("mergeConflicts") return self.byName("mergeConflicts")
} }

7
pkg/integration/tests/branch/reset.go
View File

@ -29,13 +29,16 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Branches(). t.Views().Branches().
Focus(). Focus().
Lines( Lines(
Contains("current-branch"), Contains("current-branch").IsSelected(),
Contains("other-branch"), Contains("other-branch"),
). ).
SelectNextItem(). SelectNextItem().
Press(keys.Commits.ViewResetOptions) Press(keys.Commits.ViewResetOptions)
t.ExpectMenu().Title(Contains("reset to other-branch")).Select(Contains("hard reset")).Confirm() t.ExpectMenu().
Title(Contains("reset to other-branch")).
Select(Contains("hard reset")).
Confirm()
// assert that we now have the expected commits in the commit panel // assert that we now have the expected commits in the commit panel
t.Views().Commits(). t.Views().Commits().