go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-27 00:51:18 +02:00
Code Issues Releases Activity

update test

Browse Source
This commit is contained in:
Jesse Duffield
2022-09-17 11:58:24 -07:00
committed by Luka Markušić
parent 0141bbde0e
commit 23d39c79b2
30 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/integration/components/input.go
View File

@ -76,6 +76,12 @@ func (self *Input) Confirm() {
self.pressKey(self.keys.Universal.Confirm) self.pressKey(self.keys.Universal.Confirm)
} }
func (self *Input) ProceedWhenAsked(matcher *matcher) {
self.assert.InConfirm()
self.assert.MatchCurrentViewContent(matcher)
self.Confirm()
}
// i.e. same as Confirm // i.e. same as Confirm
func (self *Input) Enter() { func (self *Input) Enter() {
self.pressKey(self.keys.Universal.Confirm) self.pressKey(self.keys.Universal.Confirm)

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

@ -5,6 +5,11 @@ import (
. "github.com/jesseduffield/lazygit/pkg/integration/components" . "github.com/jesseduffield/lazygit/pkg/integration/components"
) )
var (
postMergeFileContent = "post merge file content"
postMergeFilename = "post-merge-file"
)
var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{ var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Amends a staged file to a merge commit.", Description: "Amends a staged file to a merge commit.",
ExtraCmdArgs: "", ExtraCmdArgs: "",
@ -13,14 +18,14 @@ var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{
SetupRepo: func(shell *Shell) { SetupRepo: func(shell *Shell) {
shell. shell.
NewBranch("development-branch"). NewBranch("development-branch").
CreateFileAndAdd("initial-file", "content"). CreateFileAndAdd("initial-file", "initial file content").
Commit("initial commit"). Commit("initial commit").
NewBranch("feature-branch"). // it's also checked out automatically NewBranch("feature-branch"). // it's also checked out automatically
CreateFileAndAdd("new-feature-file", "new content"). CreateFileAndAdd("new-feature-file", "new content").
Commit("new feature commit"). Commit("new feature commit").
CheckoutBranch("development-branch"). Checkout("development-branch").
Merge("feature-branch"). Merge("feature-branch").
CreateFileAndAdd("post-merge-file", "content") CreateFileAndAdd(postMergeFilename, postMergeFileContent)
}, },
Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
assert.CommitCount(3) assert.CommitCount(3)
@ -28,10 +33,18 @@ var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{
input.SwitchToCommitsWindow() input.SwitchToCommitsWindow()
assert.CurrentViewName("commits") assert.CurrentViewName("commits")
input.PressKeys(keys.Commits.AmendToCommit) mergeCommitMessage := "Merge branch 'feature-branch' into development-branch"
input.PressKeys(keys.Universal.Return) assert.MatchHeadCommitMessage(Contains(mergeCommitMessage))
assert.MatchHeadCommitMessage(Contains("Merge")) input.PressKeys(keys.Commits.AmendToCommit)
input.ProceedWhenAsked(Contains("Are you sure you want to amend this commit with your staged files?"))
// assuring we haven't added a brand new commit
assert.CommitCount(3) assert.CommitCount(3)
assert.MatchHeadCommitMessage(Contains(mergeCommitMessage))
// assuring the post-merge file shows up in the merge commit.
assert.MatchMainViewContent(Contains(postMergeFilename))
assert.MatchMainViewContent(Contains("++" + postMergeFileContent))
}, },
}) })

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG
View File

@ -1 +1 @@
new feature commit fixup! Merge branch 'feature-branch' into development-branch

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD
View File

@ -1 +1 @@
a69464e3729a09e3a526d4a2db209ee43e64ba1c 7802c86c6ce62289e32aa13d0c85dc3f733195cb

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config
View File

@ -3,6 +3,8 @@
filemode = true filemode = true
bare = false bare = false
logallrefupdates = true logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user] [user]
email = CI@example.com email = CI@example.com
name = CI name = CI

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/index
View File

Binary file not shown.

1
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude
View File

@ -4,3 +4,4 @@
# exclude patterns (uncomment them if you want to use them): # exclude patterns (uncomment them if you want to use them):
# *.[oa] # *.[oa]
# *~ # *~
.DS_Store

17
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD
View File

@ -1,5 +1,12 @@
0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 commit (initial): initial commit 0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 commit (initial): initial commit
a69464e3729a09e3a526d4a2db209ee43e64ba1c a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 checkout: moving from development-branch to feature-branch 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 checkout: moving from development-branch to feature-branch
a69464e3729a09e3a526d4a2db209ee43e64ba1c 5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f CI <CI@example.com> 1662823399 +0200 commit: new feature commit 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440492 -0700 commit: new feature commit
5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 checkout: moving from feature-branch to development-branch d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 checkout: moving from feature-branch to development-branch
a69464e3729a09e3a526d4a2db209ee43e64ba1c 77e1bb1effc5857c4d701219a001823432e3586d CI <CI@example.com> 1662823399 +0200 merge feature-branch: Merge made by the 'ort' strategy. 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI <CI@example.com> 1663440492 -0700 merge feature-branch: Merge made by the 'recursive' strategy.
f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI <CI@example.com> 1663440493 -0700 commit: fixup! Merge branch 'feature-branch' into development-branch
7802c86c6ce62289e32aa13d0c85dc3f733195cb 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440494 -0700 rebase (start): checkout f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15^
3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440494 -0700 rebase: fast-forward
d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440494 -0700 rebase (reset): 'onto'
3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI <CI@example.com> 1663440494 -0700 rebase: fast-forward
f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 f517de66e2a158d4a1d85246611cae9ca23a938d CI <CI@example.com> 1663440494 -0700 rebase (fixup): Merge branch 'feature-branch' into development-branch
f517de66e2a158d4a1d85246611cae9ca23a938d f517de66e2a158d4a1d85246611cae9ca23a938d CI <CI@example.com> 1663440494 -0700 rebase (finish): returning to refs/heads/development-branch

6
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch
View File

@ -1,2 +1,4 @@
0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 commit (initial): initial commit 0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 commit (initial): initial commit
a69464e3729a09e3a526d4a2db209ee43e64ba1c 77e1bb1effc5857c4d701219a001823432e3586d CI <CI@example.com> 1662823399 +0200 merge feature-branch: Merge made by the 'ort' strategy. 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI <CI@example.com> 1663440492 -0700 merge feature-branch: Merge made by the 'recursive' strategy.
f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI <CI@example.com> 1663440493 -0700 commit: fixup! Merge branch 'feature-branch' into development-branch
7802c86c6ce62289e32aa13d0c85dc3f733195cb f517de66e2a158d4a1d85246611cae9ca23a938d CI <CI@example.com> 1663440494 -0700 rebase (finish): refs/heads/development-branch onto 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3

4
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch
View File

@ -1,2 +1,2 @@
0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200 branch: Created from HEAD 0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700 branch: Created from HEAD
a69464e3729a09e3a526d4a2db209ee43e64ba1c 5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f CI <CI@example.com> 1662823399 +0200 commit: new feature commit 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440492 -0700 commit: new feature commit

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d
View File

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/34/9e7420fb0fcc3ff740eae5b9dc103a1261558e Normal file
View File

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 Normal file
View File

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3f/891fb57220f67735a13cb5a65d27c8ad388030 Normal file
View File

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/48/9361eca1233745c15acc9381322e97b4d44b57
View File

Binary file not shown.

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/5e/62a9dc2e1352e7ee6ecf17033e2ed3382efc6f
View File

@ -1,2 +0,0 @@
x��K
�@]�)z/H�g�ɀ��U�љ�A�|�����WT�K�4= ק��YR���-1 l�R46����9��V�02�A|#�8�[-:�q�c"xh�J���X6�z�v���.i�nT�J+��Hgfw��T������ +���� ��?>

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/63/e06ef6d5baa80461d12e953ee7e75444180d8f Normal file
View File

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea
View File

Binary file not shown.

1
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/77/e1bb1effc5857c4d701219a001823432e3586d
View File

@ -1 +0,0 @@
x���j1ES�W�s�3�Y B0�r���]��!�|~��)Ͻ�9����9���U��'�"c`V�Px-�`�|1��|��mZ�4����HI}�@��R�hG��I{��i�F�y ���J?zf2s$����]��Ng�v:���vë����E(sJ�ٓ�ݾ�

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/78/02c86c6ce62289e32aa13d0c85dc3f733195cb Normal file
View File

@ -0,0 +1,2 @@
x��Mj�0F��)���R$��J �,z��x�1D�r��kh���޷xTK�; .~�� ֍ݠ%k!�"�iF�y��h�f���j��K �|v�����`1O1� �Q�|6^��o���
����O,띿��o0!X��-u�Z����ͻ���������!7\�a�[��?`^z��|�k��_B���N�

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7a/02580e6e6ba96ea8fb9c7ebad7d03d00ec0643 Normal file
View File

Binary file not shown.

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7b/d422e3608d9bcfeef85748c90a5ec114fc2c17 Normal file
View File

Binary file not shown.

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/a6/9464e3729a09e3a526d4a2db209ee43e64ba1c
View File

@ -1,2 +0,0 @@
x��K
�0@]��$���]��8`�1�D��

BIN
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 Normal file
View File

Binary file not shown.

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d Normal file
View File

@ -0,0 +1,2 @@
x���jAD�Wt�Hf��9@�"��9�-�fwFƟ�˱���^����m� �et�,Gx6J��R��g��9�Z��I��9`�R�2Ȧ�YBfT�Q��XCe��b��{���?������1�
�p�X�:Ve�7�Ǹ���:�/��Nm�㵬퍴s�Yq4tT^�i_w��p~���'(���+i<:���@�e�T�������yL?2#Y|

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 Normal file
View File

@ -0,0 +1,2 @@
x���jC1DS߯�Ε�kiB�r����������C>?�����9�i�<����U!W�4&Gµ���)#5v���{����V�.b�}��*�ق Z6
��ǜ}��x�-���GS2��R4��Y\<�&MSy����|����M�ʼ�����+��"�Cptٹi_w���ħw�

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch
View File

@ -1 +1 @@
77e1bb1effc5857c4d701219a001823432e3586d f517de66e2a158d4a1d85246611cae9ca23a938d

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch
View File

@ -1 +1 @@
5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f d1c7801838f293fe8f4b49dae6b4919d0359e6e6

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file
View File

@ -1 +1 @@
content initial file content

2
test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file
View File

@ -1 +1 @@
content post merge file content