integration tests for commit in staged files and unstaged files menus

pkg/integration/tests/commit/staged.go

@@ -0,0 +1,33 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var Staged = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Staging a couple files, going in the staged files menu and committing",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFile("myfile", "myfile content")
+		shell.CreateFile("myfile2", "myfile2 content")
+	},
+	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
+		assert.CommitCount(0)
+
+		input.PrimaryAction()
+		input.NextItem()
+		input.PrimaryAction()
+		input.Confirm()
+		input.PressKeys(keys.Files.CommitChanges)
+
+		commitMessage := "my commit message"
+		input.Type(commitMessage)
+		input.Confirm()
+
+		assert.CommitCount(1)
+		assert.MatchHeadCommitMessage(Equals(commitMessage))
+	},
+})

pkg/integration/tests/commit/unstaged.go

@@ -0,0 +1,32 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var Unstaged = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Staging a couple files, going in the unstaged files menu and committing",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFile("myfile", "myfile content")
+		shell.CreateFile("myfile2", "myfile2 content")
+	},
+	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
+		assert.CommitCount(0)
+
+		input.PrimaryAction()
+		input.NextItem()
+		input.Confirm()
+		input.PressKeys(keys.Files.CommitChanges)
+
+		commitMessage := "my commit message"
+		input.Type(commitMessage)
+		input.Confirm()
+
+		assert.CommitCount(1)
+		assert.MatchHeadCommitMessage(Equals(commitMessage))
+	},
+})

pkg/integration/tests/tests.go

@@ -36,6 +36,8 @@ var tests = []*components.IntegrationTest{
 	cherry_pick.CherryPickConflicts,
 	commit.Commit,
 	commit.NewBranch,
+	commit.Staged,
+	commit.Unstaged,
 	custom_commands.Basic,
 	custom_commands.FormPrompts,
 	custom_commands.MenuFromCommand,

test/integration_new/commit/staged/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+my commit message

test/integration_new/commit/staged/expected/repo/.git_keep/HEAD

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

test/integration_new/commit/staged/expected/repo/.git_keep/config

@@ -0,0 +1,12 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[user]
+	email = CI@example.com
+	name = CI
+[commit]
+	gpgSign = false
+[protocol "file"]
+	allow = always

test/integration_new/commit/staged/expected/repo/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration_new/commit/staged/expected/repo/.git_keep/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

test/integration_new/commit/staged/expected/repo/.git_keep/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 ef3197feca3fdc5b9f0170f483c6ff138d5cf186 CI <CI@example.com> 1669566692 +0100	commit (initial): my commit message

test/integration_new/commit/staged/expected/repo/.git_keep/logs/refs/heads/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 ef3197feca3fdc5b9f0170f483c6ff138d5cf186 CI <CI@example.com> 1669566692 +0100	commit (initial): my commit message

test/integration_new/commit/staged/expected/repo/.git_keep/objects/ef/3197feca3fdc5b9f0170f483c6ff138d5cf186

@@ -0,0 +1,2 @@
+x
<01><>A
+Â0E]ç³$™iÆD„®zŒ1<C592>ªà<C2AA>ÒFÐÛðnþâñ?³G…yWWU Qœæc‘X)§._Ã,‚N„œ%öCtòª÷²Â0Âi/ú[žzÈÅΘûÈmö>xïm'UÿÔ<C3BF>}à—€é¶ÉMݶ0

test/integration_new/commit/staged/expected/repo/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+ef3197feca3fdc5b9f0170f483c6ff138d5cf186

test/integration_new/commit/staged/expected/repo/myfile

@@ -0,0 +1 @@
+myfile content

test/integration_new/commit/staged/expected/repo/myfile2

@@ -0,0 +1 @@
+myfile2 content

test/integration_new/commit/staging/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+my commit message

test/integration_new/commit/staging/expected/repo/.git_keep/HEAD

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

test/integration_new/commit/staging/expected/repo/.git_keep/config

@@ -0,0 +1,12 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[user]
+	email = CI@example.com
+	name = CI
+[commit]
+	gpgSign = false
+[protocol "file"]
+	allow = always

test/integration_new/commit/staging/expected/repo/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration_new/commit/staging/expected/repo/.git_keep/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

test/integration_new/commit/staging/expected/repo/.git_keep/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 28f8e24755d8792e66738e36f193949a68021709 CI <CI@example.com> 1669566470 +0100	commit (initial): my commit message

test/integration_new/commit/staging/expected/repo/.git_keep/logs/refs/heads/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 28f8e24755d8792e66738e36f193949a68021709 CI <CI@example.com> 1669566470 +0100	commit (initial): my commit message

test/integration_new/commit/staging/expected/repo/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+28f8e24755d8792e66738e36f193949a68021709

test/integration_new/commit/staging/expected/repo/myfile

@@ -0,0 +1 @@
+myfile content

test/integration_new/commit/staging/expected/repo/myfile2

@@ -0,0 +1 @@
+myfile2 content

test/integration_new/commit/unstaged/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+my commit message

test/integration_new/commit/unstaged/expected/repo/.git_keep/HEAD

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

test/integration_new/commit/unstaged/expected/repo/.git_keep/config

@@ -0,0 +1,12 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[user]
+	email = CI@example.com
+	name = CI
+[commit]
+	gpgSign = false
+[protocol "file"]
+	allow = always

test/integration_new/commit/unstaged/expected/repo/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration_new/commit/unstaged/expected/repo/.git_keep/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

test/integration_new/commit/unstaged/expected/repo/.git_keep/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 d46951396fe8179592ec90aee0c0414fc0512fc5 CI <CI@example.com> 1669566705 +0100	commit (initial): my commit message

test/integration_new/commit/unstaged/expected/repo/.git_keep/logs/refs/heads/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 d46951396fe8179592ec90aee0c0414fc0512fc5 CI <CI@example.com> 1669566705 +0100	commit (initial): my commit message

test/integration_new/commit/unstaged/expected/repo/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+d46951396fe8179592ec90aee0c0414fc0512fc5

test/integration_new/commit/unstaged/expected/repo/myfile

@@ -0,0 +1 @@
+myfile content

test/integration_new/commit/unstaged/expected/repo/myfile2

@@ -0,0 +1 @@
+myfile2 content