integration tests for commit without pre-commit hooks in staging files menu

pkg/integration/tests/commit/staged_without_hooks.go

@@ -0,0 +1,34 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var StagedWithoutHooks = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Staging a couple files, going in the staged files menu, unstaging a line then committing without pre-commit hooks",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.
+			CreateFile("myfile", "myfile content\nwith a second line").
+			CreateFile("myfile2", "myfile2 content")
+	},
+	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
+		assert.CommitCount(0)
+
+		input.PrimaryAction()
+		input.Confirm()
+		input.PrimaryAction()
+		input.PressKeys(keys.Files.CommitChangesWithoutHook)
+
+		commitMessage := "my commit message"
+		input.Type(commitMessage)
+		input.Confirm()
+
+		assert.CommitCount(1)
+		assert.MatchHeadCommitMessage(Equals("WIP" + commitMessage))
+		assert.CurrentWindowName("stagingSecondary")
+	},
+})

pkg/integration/tests/commit/unstaged_without_hooks.go

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

pkg/integration/tests/tests.go

@@ -38,6 +38,8 @@ var tests = []*components.IntegrationTest{
 	commit.NewBranch,
 	commit.Staged,
 	commit.Unstaged,
+	commit.StagedWithoutHooks,
+	commit.UnstagedWithoutHooks,
 	custom_commands.Basic,
 	custom_commands.FormPrompts,
 	custom_commands.MenuFromCommand,

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

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

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

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

test/integration_new/commit/staged_without_hooks/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_without_hooks/expected/repo/.git_keep/description

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

test/integration_new/commit/staged_without_hooks/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_without_hooks/expected/repo/.git_keep/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 4a33e6274dd3bc702442966e6774e7688bb7af64 CI <CI@example.com> 1669660775 +0100	commit (initial): WIPmy commit message

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

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 4a33e6274dd3bc702442966e6774e7688bb7af64 CI <CI@example.com> 1669660775 +0100	commit (initial): WIPmy commit message

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

@@ -0,0 +1 @@
+4a33e6274dd3bc702442966e6774e7688bb7af64

test/integration_new/commit/staged_without_hooks/expected/repo/myfile

@@ -0,0 +1,2 @@
+myfile content
+with a second line

test/integration_new/commit/staged_without_hooks/expected/repo/myfile2

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

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

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

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

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

test/integration_new/commit/unstaged_without_hooks/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_without_hooks/expected/repo/.git_keep/description

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

test/integration_new/commit/unstaged_without_hooks/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_without_hooks/expected/repo/.git_keep/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 ebc03af0e92eb50f1ab1dec0697880ed9da9b02d CI <CI@example.com> 1669660788 +0100	commit (initial): WIPmy commit message

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

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 ebc03af0e92eb50f1ab1dec0697880ed9da9b02d CI <CI@example.com> 1669660788 +0100	commit (initial): WIPmy commit message

test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/objects/e7/bcdb57454dacf229e5be8122bb27bb56d78dba

@@ -0,0 +1 @@
+x
+)JMU06a040031QČ­LËĚIe`xäf×ĹvYRú†j°\ě~µ]‡tł
ö
Î

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

@@ -0,0 +1 @@
+ebc03af0e92eb50f1ab1dec0697880ed9da9b02d

test/integration_new/commit/unstaged_without_hooks/expected/repo/myfile

@@ -0,0 +1,2 @@
+myfile content
+with a second line

test/integration_new/commit/unstaged_without_hooks/expected/repo/myfile2

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