update test

pkg/integration/components/input.go

@@ -76,6 +76,12 @@ func (self *Input) 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
 func (self *Input) Enter() {
 	self.pressKey(self.keys.Universal.Confirm)

pkg/integration/tests/interactive_rebase/amend_merge.go

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

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG

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

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD

@@ -1 +1 @@
-a69464e3729a09e3a526d4a2db209ee43e64ba1c
+7802c86c6ce62289e32aa13d0c85dc3f733195cb

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config

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

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude

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

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD

@@ -1,5 +1,12 @@
-0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200	commit (initial): initial commit
-a69464e3729a09e3a526d4a2db209ee43e64ba1c a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200	checkout: moving from development-branch to feature-branch
-a69464e3729a09e3a526d4a2db209ee43e64ba1c 5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f CI <CI@example.com> 1662823399 +0200	commit: new feature commit
-5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200	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.
+0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700	commit (initial): initial commit
+3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700	checkout: moving from development-branch to feature-branch
+3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440492 -0700	commit: new feature commit
+d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700	checkout: moving from feature-branch to development-branch
+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

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

@@ -1,2 +1,4 @@
-0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI <CI@example.com> 1662823399 +0200	commit (initial): initial commit
-a69464e3729a09e3a526d4a2db209ee43e64ba1c 77e1bb1effc5857c4d701219a001823432e3586d CI <CI@example.com> 1662823399 +0200	merge feature-branch: Merge made by the 'ort' strategy.
+0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700	commit (initial): initial commit
+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

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

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

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/78/02c86c6ce62289e32aa13d0c85dc3f733195cb

@@ -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�

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d

@@ -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|

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15

@@ -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�
+���]�`Zƣ��ඌD?��n���{L�r[Y�

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

@@ -1 +1 @@
-77e1bb1effc5857c4d701219a001823432e3586d
+f517de66e2a158d4a1d85246611cae9ca23a938d

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

@@ -1 +1 @@
-5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f
+d1c7801838f293fe8f4b49dae6b4919d0359e6e6

test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file

@@ -1 +1 @@
-content
+initial file content

test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file

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