migrate menuFromCommand integration test

pkg/integration/components/assert.go

@@ -52,7 +52,7 @@ func Contains(target string) *matcher {
 
 func Equals(target string) *matcher {
 	return &matcher{testFn: func(value string) (bool, string) {
-		return target == value, fmt.Sprintf("Expected '%T' to equal '%T'", value, target)
+		return target == value, fmt.Sprintf("Expected '%s' to equal '%s'", value, target)
 	}}
 }
 
@@ -123,14 +123,14 @@ func (self *Assert) MatchSelectedLine(matcher *matcher) {
 func (self *Assert) InPrompt() {
 	self.assertWithRetries(func() (bool, string) {
 		currentView := self.gui.CurrentContext().GetView()
-		return currentView.Name() == "confirmation" && currentView.Editable, fmt.Sprintf("Expected prompt popup to be focused")
+		return currentView.Name() == "confirmation" && currentView.Editable, "Expected prompt popup to be focused"
 	})
 }
 
 func (self *Assert) InConfirm() {
 	self.assertWithRetries(func() (bool, string) {
 		currentView := self.gui.CurrentContext().GetView()
-		return currentView.Name() == "confirmation" && !currentView.Editable, fmt.Sprintf("Expected confirmation popup to be focused")
+		return currentView.Name() == "confirmation" && !currentView.Editable, "Expected confirmation popup to be focused"
 	})
 }
 
@@ -138,13 +138,13 @@ func (self *Assert) InAlert() {
 	// basically the same thing as a confirmation popup with the current implementation
 	self.assertWithRetries(func() (bool, string) {
 		currentView := self.gui.CurrentContext().GetView()
-		return currentView.Name() == "confirmation" && !currentView.Editable, fmt.Sprintf("Expected alert popup to be focused")
+		return currentView.Name() == "confirmation" && !currentView.Editable, "Expected alert popup to be focused"
 	})
 }
 
 func (self *Assert) InMenu() {
 	self.assertWithRetries(func() (bool, string) {
-		return self.gui.CurrentContext().GetView().Name() == "menu", fmt.Sprintf("Expected popup menu to be focused")
+		return self.gui.CurrentContext().GetView().Name() == "menu", "Expected popup menu to be focused"
 	})
 }
 

pkg/integration/tests/custom_commands/menu_from_command.go

@@ -0,0 +1,74 @@
+package custom_commands
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+// NOTE: we're getting a weird offset in the popup prompt for some reason. Not sure what's behind that.
+
+var MenuFromCommand = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Using menuFromCommand prompt type",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupRepo: func(shell *Shell) {
+		shell.
+			EmptyCommit("foo").
+			EmptyCommit("bar").
+			EmptyCommit("baz").
+			NewBranch("feature/foo")
+	},
+	SetupConfig: func(cfg *config.AppConfig) {
+		cfg.UserConfig.CustomCommands = []config.CustomCommand{
+			{
+				Key:     "a",
+				Context: "localBranches",
+				Command: `echo "{{index .PromptResponses 0}} {{index .PromptResponses 1}} {{ .SelectedLocalBranch.Name }}" > output.txt`,
+				Prompts: []config.CustomCommandPrompt{
+					{
+						Type:        "menuFromCommand",
+						Title:       "Choose commit message",
+						Command:     `git log --oneline --pretty=%B`,
+						Filter:      `(?P<commit_message>.*)`,
+						ValueFormat: `{{ .commit_message }}`,
+						LabelFormat: `{{ .commit_message | yellow }}`,
+					},
+					{
+						Type:         "input",
+						Title:        "Description",
+						InitialValue: `{{ if .SelectedLocalBranch.Name }}Branch: #{{ .SelectedLocalBranch.Name }}{{end}}`,
+					},
+				},
+			},
+		}
+	},
+	Run: func(
+		shell *Shell,
+		input *Input,
+		assert *Assert,
+		keys config.KeybindingConfig,
+	) {
+		assert.WorkingTreeFileCount(0)
+		input.SwitchToBranchesWindow()
+
+		input.PressKeys("a")
+
+		assert.InMenu()
+		assert.MatchCurrentViewTitle(Equals("Choose commit message"))
+		assert.MatchSelectedLine(Equals("baz"))
+		input.NextItem()
+		assert.MatchSelectedLine(Equals("bar"))
+		input.Confirm()
+
+		assert.InPrompt()
+		assert.MatchCurrentViewTitle(Equals("Description"))
+		input.Type(" my branch")
+		input.Confirm()
+
+		input.SwitchToFilesWindow()
+
+		assert.WorkingTreeFileCount(1)
+		assert.MatchSelectedLine(Contains("output.txt"))
+		assert.MatchMainViewContent(Contains("bar Branch: #feature/foo my branch feature/foo"))
+	},
+})

pkg/integration/tests/tests.go

@@ -26,6 +26,7 @@ var tests = []*components.IntegrationTest{
 	interactive_rebase.One,
 	custom_commands.Basic,
 	custom_commands.MultiplePrompts,
+	custom_commands.MenuFromCommand,
 }
 
 func GetTests() []*components.IntegrationTest {

test/integration/customCommandsComplex/config/config.yml

@@ -1,31 +0,0 @@
-disableStartupPopups: true
-customCommands:
-  - key: 'N'
-    description: 'Add file'
-    context: 'localBranches'
-    command: 'echo "{{index .PromptResponses 0}} {{index .PromptResponses 1}} {{index .PromptResponses 2}} {{ .SelectedLocalBranch.Name }}" > output.txt'
-    loadingText: 'Running custom command...'
-    prompts:
-      - type: 'menuFromCommand'
-        title: 'Title'
-        command: 'git log --oneline --pretty=%B'
-        filter: '(?P<commit_message>.*)'
-        valueFormat: '{{ .commit_message }}'
-        labelFormat: '{{ .commit_message | yellow }}'
-      - type: 'input'
-        title: 'Description'
-        initialValue: "{{ if .SelectedLocalBranch.Name }}Branch: #{{ .SelectedLocalBranch.Name }}{{end}}"
-      - type: 'menu'
-        title: 'yes or no'
-        options:
-          - name: 'no'
-            value: 'false'
-          - name: 'yes'
-            value: 'true'
-gui:
-  theme:
-    activeBorderColor:
-    - green
-    - bold
-    SelectedRangeBgcolor:
-    - reverse

test/integration/customCommandsComplex/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -1 +0,0 @@
-test

test/integration/customCommandsComplex/expected/repo/.git_keep/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/master

test/integration/customCommandsComplex/expected/repo/.git_keep/logs/HEAD

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 ab38b1ca116f77648925d952e731f419db360cdb CI <CI@example.com> 1642201096 +1100	commit (initial): myfile1
-ab38b1ca116f77648925d952e731f419db360cdb 4fdfedfd9d406506be8b02f5b863dbc08d43cc9f CI <CI@example.com> 1642201096 +1100	commit: myfile2
-4fdfedfd9d406506be8b02f5b863dbc08d43cc9f 7dd93a4be3d27d40fbe791d6d77e0d2fedc4d785 CI <CI@example.com> 1642201096 +1100	commit: myfile3
-7dd93a4be3d27d40fbe791d6d77e0d2fedc4d785 f708d3e3819470a69f6c8562ff1e68eef02f8cac CI <CI@example.com> 1642201096 +1100	commit: myfile4
-f708d3e3819470a69f6c8562ff1e68eef02f8cac 5428838691c97ac192c8b8e1c3f573d8541a94b6 CI <CI@example.com> 1642201104 +1100	commit: test

test/integration/customCommandsComplex/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 ab38b1ca116f77648925d952e731f419db360cdb CI <CI@example.com> 1642201096 +1100	commit (initial): myfile1
-ab38b1ca116f77648925d952e731f419db360cdb 4fdfedfd9d406506be8b02f5b863dbc08d43cc9f CI <CI@example.com> 1642201096 +1100	commit: myfile2
-4fdfedfd9d406506be8b02f5b863dbc08d43cc9f 7dd93a4be3d27d40fbe791d6d77e0d2fedc4d785 CI <CI@example.com> 1642201096 +1100	commit: myfile3
-7dd93a4be3d27d40fbe791d6d77e0d2fedc4d785 f708d3e3819470a69f6c8562ff1e68eef02f8cac CI <CI@example.com> 1642201096 +1100	commit: myfile4
-f708d3e3819470a69f6c8562ff1e68eef02f8cac 5428838691c97ac192c8b8e1c3f573d8541a94b6 CI <CI@example.com> 1642201104 +1100	commit: test

test/integration/customCommandsComplex/expected/repo/.git_keep/objects/ab/38b1ca116f77648925d952e731f419db360cdb

@@ -1,2 +0,0 @@
-x
�ÍA
-ƒ0@Ñ®sŠÙÊL:#)¸ò1™PÁ!")ØÛ×#tûyðS5[Ë¥íª€*©`”¹ë5df¥ 9��T:žùž…KLï⧽ëãÏqzém[õ–ª
@ÂÞ#a/p%Btg='MÿäξeY•Ü.,,·

test/integration/customCommandsComplex/expected/repo/.git_keep/objects/f7/08d3e3819470a69f6c8562ff1e68eef02f8cac

@@ -1,2 +0,0 @@
-x
�ЮA
-Т0@Qз9Eі�Ь$�I"BW=F��`СиR"шээм~от�ЕЕЅ[LtъЛЊu�1№�*в�ЬaШ>АFvфCЩ!ЁйђЎЏnЃHђ�fѕтЂдYcBa�QA\U)$q&Пћcнэ8йы8нѕ�лідKYлЭ"�s��и�
ЬQ�ЉЎrгОuy*�3н9�

test/integration/customCommandsComplex/expected/repo/.git_keep/refs/heads/master

@@ -1 +0,0 @@
-5428838691c97ac192c8b8e1c3f573d8541a94b6

test/integration/customCommandsComplex/expected/repo/myfile1

@@ -1 +0,0 @@
-test1

test/integration/customCommandsComplex/expected/repo/myfile2

@@ -1 +0,0 @@
-test2

test/integration/customCommandsComplex/expected/repo/myfile3

@@ -1 +0,0 @@
-test3

test/integration/customCommandsComplex/expected/repo/myfile4

@@ -1 +0,0 @@
-test4

test/integration/customCommandsComplex/expected/repo/output.txt

@@ -1 +0,0 @@
-myfile2 Branch: #master haha true master

test/integration/customCommandsComplex/recording.json

@@ -1 +0,0 @@
-{"KeyEvents":[{"Timestamp":623,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1369,"Mod":0,"Key":256,"Ch":78},{"Timestamp":1904,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2033,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2328,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2848,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3296,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3616,"Mod":0,"Key":127,"Ch":127},{"Timestamp":3824,"Mod":0,"Key":256,"Ch":104},{"Timestamp":3879,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3927,"Mod":0,"Key":256,"Ch":104},{"Timestamp":4000,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4239,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4809,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5024,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5824,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6079,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6376,"Mod":0,"Key":256,"Ch":99},{"Timestamp":6591,"Mod":0,"Key":256,"Ch":116},{"Timestamp":6640,"Mod":0,"Key":256,"Ch":101},{"Timestamp":6816,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6856,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7136,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7487,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":36}]}

test/integration/customCommandsComplex/setup.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $1
-
-git init
-
-git config user.email "CI@example.com"
-git config user.name "CI"
-
-echo test1 > myfile1
-git add .
-git commit -am "myfile1"
-echo test2 > myfile2
-git add .
-git commit -am "myfile2"
-echo test3 > myfile3
-git add .
-git commit -am "myfile3"
-echo test4 > myfile4
-git add .
-git commit -am "myfile4"

test/integration/customCommandsComplex/test.json

@@ -1,4 +0,0 @@
-{
-  "description": "Invoke a custom command that creates a file, and then stage and commit that file. In this case we're using a more customised flow",
-  "speed": 5
-}

test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+baz

test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/feature/foo

test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/HEAD

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 d50975554a574b9c66e109927fdb4edfb6bbadb3 CI <CI@example.com> 1660476303 +1000	commit (initial): foo
+d50975554a574b9c66e109927fdb4edfb6bbadb3 af550d3777f20bf024ad55c9c796e7e85ef32ccb CI <CI@example.com> 1660476303 +1000	commit: bar
+af550d3777f20bf024ad55c9c796e7e85ef32ccb 16919871d6b442beac07e1573c557ca433cff356 CI <CI@example.com> 1660476303 +1000	commit: baz
+16919871d6b442beac07e1573c557ca433cff356 16919871d6b442beac07e1573c557ca433cff356 CI <CI@example.com> 1660476303 +1000	checkout: moving from master to feature/foo

test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/feature/foo

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 16919871d6b442beac07e1573c557ca433cff356 CI <CI@example.com> 1660476303 +1000	branch: Created from HEAD

test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/master

@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 d50975554a574b9c66e109927fdb4edfb6bbadb3 CI <CI@example.com> 1660476303 +1000	commit (initial): foo
+d50975554a574b9c66e109927fdb4edfb6bbadb3 af550d3777f20bf024ad55c9c796e7e85ef32ccb CI <CI@example.com> 1660476303 +1000	commit: bar
+af550d3777f20bf024ad55c9c796e7e85ef32ccb 16919871d6b442beac07e1573c557ca433cff356 CI <CI@example.com> 1660476303 +1000	commit: baz

test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/d5/0975554a574b9c66e109927fdb4edfb6bbadb3

@@ -0,0 +1,3 @@
+x
�ֽA
+ֲ0@Q׳9ֵל™₪׃1
)BW=F&� `˜R"פרצn?~±ײ�<…K�U�$†q-L¡«₪��:’װ¸r
+1VQ¥„הע·¿l‡y�ַ¼<ץָm�ט­X›ְ3#�yְ
®�YֿI׳?¹«fמ~�+T

test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/refs/heads/feature/foo

@@ -0,0 +1 @@
+16919871d6b442beac07e1573c557ca433cff356

test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+16919871d6b442beac07e1573c557ca433cff356

test/integration_new/custom_commands/menu_from_command/expected/repo/output.txt

@@ -0,0 +1 @@
+bar Branch: #feature/foo my branch feature/foo