add commit revert integration test

pkg/integration/components/assert.go

@@ -2,6 +2,7 @@ package components
 
 import (
 	"fmt"
+	"os"
 	"regexp"
 	"strings"
 	"time"
@@ -259,3 +260,19 @@ func (self *Assert) assertWithRetries(test func() (bool, string)) {
 func (self *Assert) Fail(message string) {
 	self.gui.Fail(message)
 }
+
+// This does _not_ check the files panel, it actually checks the filesystem
+func (self *Assert) FileSystemPathPresent(path string) {
+	self.assertWithRetries(func() (bool, string) {
+		_, err := os.Stat(path)
+		return err == nil, fmt.Sprintf("Expected path '%s' to exist, but it does not", path)
+	})
+}
+
+// This does _not_ check the files panel, it actually checks the filesystem
+func (self *Assert) FileSystemPathNotPresent(path string) {
+	self.assertWithRetries(func() (bool, string) {
+		_, err := os.Stat(path)
+		return os.IsNotExist(err), fmt.Sprintf("Expected path '%s' to not exist, but it does", path)
+	})
+}

pkg/integration/tests/commit/revert.go

@@ -0,0 +1,37 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var Revert = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Reverts a commit",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFile("myfile", "myfile content")
+		shell.GitAddAll()
+		shell.Commit("first commit")
+	},
+	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
+		assert.CommitCount(1)
+
+		input.SwitchToCommitsWindow()
+
+		input.PressKeys(keys.Commits.RevertCommit)
+		assert.InConfirm()
+		assert.MatchCurrentViewTitle(Equals("Revert commit"))
+		assert.MatchCurrentViewContent(MatchesRegexp("Are you sure you want to revert \\w+?"))
+		input.Confirm()
+
+		assert.CommitCount(2)
+		assert.MatchHeadCommitMessage(Contains("Revert \"first commit\""))
+		input.PreviousItem()
+		assert.MatchMainViewContent(Contains("-myfile content"))
+		assert.FileSystemPathNotPresent("myfile")
+
+		input.Wait(10)
+	},
+})

pkg/integration/tests/tests.go

@@ -37,6 +37,7 @@ var tests = []*components.IntegrationTest{
 	cherry_pick.CherryPickConflicts,
 	commit.Commit,
 	commit.CommitMultiline,
+	commit.Revert,
 	commit.NewBranch,
 	commit.Staged,
 	commit.Unstaged,

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

@@ -1 +0,0 @@
-revert commit

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

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

test/integration/commitsRevert/expected/repo/.git_keep/config

@@ -1,10 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	ignorecase = true
-	precomposeunicode = true
-[user]
-	email = CI@example.com
-	name = CI

test/integration/commitsRevert/expected/repo/.git_keep/description

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

test/integration/commitsRevert/expected/repo/.git_keep/info/exclude

@@ -1,7 +0,0 @@
-# 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]
-# *~
-.DS_Store

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

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 9eaae8f342ca71c060b760870a715a6303905935 CI <CI@example.com> 1643148217 +1100	commit (initial): file0
-9eaae8f342ca71c060b760870a715a6303905935 1727eeb6864e52a8967a1a494099359dbdfcc235 CI <CI@example.com> 1643148217 +1100	commit: file1
-1727eeb6864e52a8967a1a494099359dbdfcc235 b781ffd3aa940dde39f73c9149b67e2b128de085 CI <CI@example.com> 1643148217 +1100	commit: file2
-b781ffd3aa940dde39f73c9149b67e2b128de085 ab15072795e72a2061bc40060494c3ca2138b297 CI <CI@example.com> 1643148219 +1100	revert: Revert "file1"
-ab15072795e72a2061bc40060494c3ca2138b297 7e03c9a9538a907c936de5c9a2154707b9ee541c CI <CI@example.com> 1643148227 +1100	commit (amend): revert commit

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

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 9eaae8f342ca71c060b760870a715a6303905935 CI <CI@example.com> 1643148217 +1100	commit (initial): file0
-9eaae8f342ca71c060b760870a715a6303905935 1727eeb6864e52a8967a1a494099359dbdfcc235 CI <CI@example.com> 1643148217 +1100	commit: file1
-1727eeb6864e52a8967a1a494099359dbdfcc235 b781ffd3aa940dde39f73c9149b67e2b128de085 CI <CI@example.com> 1643148217 +1100	commit: file2
-b781ffd3aa940dde39f73c9149b67e2b128de085 ab15072795e72a2061bc40060494c3ca2138b297 CI <CI@example.com> 1643148219 +1100	revert: Revert "file1"
-ab15072795e72a2061bc40060494c3ca2138b297 7e03c9a9538a907c936de5c9a2154707b9ee541c CI <CI@example.com> 1643148227 +1100	commit (amend): revert commit

test/integration/commitsRevert/expected/repo/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f

@@ -1,2 +0,0 @@
-x
+)JMU03c040031QHËÌI5`°±º²àŸÖ¶wÁ‡Þw.½ùhïTÓ[H
-Œ$x~5(í;÷rÕ¢ðªþ–WÚó-Ô
ö9

test/integration/commitsRevert/expected/repo/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c

@@ -1,4 +0,0 @@
-x
}ŽK
-1]ç½$<24>O'<27>A„YÍ1òé `œ!DñøèÚmQõxymí6@Iy<18>tDfëÙ:MÒ„Xl
-ŠÈ¡-šŒ"4)c[ìü<18>œÇZ‹Ž1Y
-ëP<EFBFBD>Î
MHäX%T¾°ôVÄ縮æ¦y¹ð;¶íΧ¼¶3 ½ï*pD”Rìt?5ø¿®ÜO<17>_Ü|3ñ
Â<

test/integration/commitsRevert/expected/repo/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085

@@ -1,2 +0,0 @@
-x
<01><>K
-Т0@]чй<0B><>ќ& "tеcL<63>	[J<04>o<EFBFBD>ріёМВѕО
	/убI<D0B1>8<EFBFBD>ZЈж<>мrЋо@в"	ЁЭ<05>кљ<D0BA>їF<>"9Ppт<70>)<29>ШР.9<EFBFBD><EFBFBD>ѕЉцкJAыЦk;є4ыћ4?хЫ}_хVЖўа<10>GQ_
<01>Q'=Ї<>ќЉЋЖЌ<D096>ъЁ\9Ј

test/integration/commitsRevert/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641

@@ -1,2 +0,0 @@
-x
+)JMU03c040031QHﾋﾌI5`ｰｱｺｲ燹ﾖｶwﾁ<77>w.ｽ<><EFBDBD>ﾓ[H
-矢y<E79FA2>5<EFBFBD>来ﾐ(桍ｧ
^-ﾝW
(x9

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

@@ -1 +0,0 @@
-7e03c9a9538a907c936de5c9a2154707b9ee541c

test/integration/commitsRevert/expected/repo/file0

@@ -1 +0,0 @@
-test0

test/integration/commitsRevert/expected/repo/file2

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

test/integration/commitsRevert/recording.json

@@ -1 +0,0 @@
-{"KeyEvents":[{"Timestamp":614,"Mod":0,"Key":259,"Ch":0},{"Timestamp":749,"Mod":0,"Key":259,"Ch":0},{"Timestamp":980,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1219,"Mod":0,"Key":256,"Ch":116},{"Timestamp":1854,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2469,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2725,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3892,"Mod":0,"Key":256,"Ch":114},{"Timestamp":5421,"Mod":2,"Key":21,"Ch":21},{"Timestamp":5854,"Mod":2,"Key":21,"Ch":21},{"Timestamp":6197,"Mod":2,"Key":21,"Ch":21},{"Timestamp":6469,"Mod":2,"Key":21,"Ch":21},{"Timestamp":6781,"Mod":2,"Key":21,"Ch":21},{"Timestamp":7078,"Mod":2,"Key":21,"Ch":21},{"Timestamp":7907,"Mod":0,"Key":256,"Ch":114},{"Timestamp":7989,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8148,"Mod":0,"Key":256,"Ch":118},{"Timestamp":8285,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8356,"Mod":0,"Key":256,"Ch":114},{"Timestamp":8493,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8604,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8700,"Mod":0,"Key":256,"Ch":102},{"Timestamp":9125,"Mod":0,"Key":127,"Ch":127},{"Timestamp":9189,"Mod":0,"Key":256,"Ch":99},{"Timestamp":9317,"Mod":0,"Key":256,"Ch":111},{"Timestamp":9509,"Mod":0,"Key":256,"Ch":109},{"Timestamp":9637,"Mod":0,"Key":256,"Ch":109},{"Timestamp":9685,"Mod":0,"Key":256,"Ch":105},{"Timestamp":9781,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9918,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11110,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/commitsRevert/setup.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $1
-
-git init
-
-git config user.email "CI@example.com"
-git config user.name "CI"
-
-echo test0 > file0
-git add .
-git commit -am file0
-
-echo test1 > file1
-git add .
-git commit -am file1
-
-echo test2 > file2
-git add .
-git commit -am file2

test/integration/commitsRevert/test.json

@@ -1 +0,0 @@
-{ "description": "Reverting a commit. Note here that our snapshot test fails if the commit SHA is included in the message hence the renaming of the revert commit after creating it", "speed": 20 }