sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

rename input to t

Browse Source
This commit is contained in:
Jesse Duffield
2022-12-27 21:35:36 +11:00
parent 53e06b71ae
commit 78b495f50a
45 changed files with 376 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/integration/tests/interactive_rebase/amend_merge.go
View File

@ -27,27 +27,27 @@ var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{
Merge("feature-branch").
CreateFileAndAdd(postMergeFilename, postMergeFileContent)
},
Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) {
input.Model().CommitCount(3)
Run: func(shell *Shell, t *TestDriver, keys config.KeybindingConfig) {
t.Model().CommitCount(3)
mergeCommitMessage := "Merge branch 'feature-branch' into development-branch"
input.Model().HeadCommitMessage(Contains(mergeCommitMessage))
t.Model().HeadCommitMessage(Contains(mergeCommitMessage))
input.Views().Commits().
t.Views().Commits().
Focus().
Press(keys.Commits.AmendToCommit)
input.ExpectConfirmation().
t.ExpectConfirmation().
Title(Equals("Amend Commit")).
Content(Contains("Are you sure you want to amend this commit with your staged files?")).
Confirm()
// assuring we haven't added a brand new commit
input.Model().CommitCount(3)
input.Model().HeadCommitMessage(Contains(mergeCommitMessage))
t.Model().CommitCount(3)
t.Model().HeadCommitMessage(Contains(mergeCommitMessage))
// assuring the post-merge file shows up in the merge commit.
input.Views().Main().
t.Views().Main().
Content(Contains(postMergeFilename)).
Content(Contains("++" + postMergeFileContent))
},

6
pkg/integration/tests/interactive_rebase/one.go
View File

@ -14,8 +14,8 @@ var One = NewIntegrationTest(NewIntegrationTestArgs{
shell.
CreateNCommits(5) // these will appears at commit 05, 04, 04, down to 01
},
Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) {
input.Views().Commits().
Run: func(shell *Shell, t *TestDriver, keys config.KeybindingConfig) {
t.Views().Commits().
Focus().
Lines(
Contains("commit 05"),
@ -61,7 +61,7 @@ var One = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 01"),
).
Tap(func() {
input.ContinueRebase()
t.ContinueRebase()
}).
Lines(
Contains("commit 02"),