migrate discard staged changes test

pkg/integration/components/file_system.go

@@ -24,3 +24,26 @@ func (self *FileSystem) PathNotPresent(path string) {
 		return os.IsNotExist(err), fmt.Sprintf("Expected path '%s' to not exist, but it does", path)
 	})
 }
+
+// Asserts that the file at the given path has the given content
+func (self *FileSystem) FileContainsContent(path string, matcher *matcher) {
+	self.assertWithRetries(func() (bool, string) {
+		_, err := os.Stat(path)
+		if os.IsNotExist(err) {
+			return false, fmt.Sprintf("Expected path '%s' to not exist, but it does", path)
+		}
+
+		output, err := os.ReadFile(path)
+		if err != nil {
+			return false, fmt.Sprintf("Expected error when reading file content at path '%s': %s", path, err.Error())
+		}
+
+		strOutput := string(output)
+
+		if ok, errMsg := matcher.context("").test(strOutput); !ok {
+			return false, fmt.Sprintf("Unexpected content in file %s: %s", path, errMsg)
+		}
+
+		return true, ""
+	})
+}

pkg/integration/tests/file/discard_staged_changes.go

@@ -0,0 +1,52 @@
+package file
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var DiscardStagedChanges = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Discarding staged changes",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig: func(config *config.AppConfig) {
+	},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("fileToRemove", "original content")
+		shell.CreateFileAndAdd("file2", "original content")
+		shell.Commit("first commit")
+
+		shell.CreateFile("file3", "original content")
+		shell.UpdateFile("fileToRemove", "new content")
+		shell.UpdateFile("file2", "new content")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			IsFocused().
+			Lines(
+				Contains(` M file2`).IsSelected(),
+				Contains(` M fileToRemove`),
+				Contains(`?? file3`),
+			).
+			SelectNextItem().
+			PressPrimaryAction().
+			Lines(
+				Contains(` M file2`),
+				Contains(`M  fileToRemove`).IsSelected(),
+				Contains(`?? file3`),
+			).
+			Press(keys.Files.ViewResetOptions)
+
+		t.ExpectPopup().Menu().Title(Equals("")).Select(Contains("discard staged changes")).Confirm()
+
+		// staged file has been removed
+		t.Views().Files().
+			Lines(
+				Contains(` M file2`),
+				Contains(`?? file3`).IsSelected(),
+			)
+
+		// the file should have the same content that it originally had, given that that was committed already
+		t.FileSystem().FileContainsContent("fileToRemove", Equals("original content"))
+	},
+})

pkg/integration/tests/tests.go

@@ -53,6 +53,7 @@ var tests = []*components.IntegrationTest{
 	custom_commands.MultiplePrompts,
 	file.DirWithUntrackedFile,
 	file.DiscardChanges,
+	file.DiscardStagedChanges,
 	interactive_rebase.AmendMerge,
 	interactive_rebase.One,
 	stash.Rename,

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

@@ -1 +0,0 @@
-file2

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

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

test/integration/discardStagedFiles/expected/repo/.git_keep/ORIG_HEAD

@@ -1 +0,0 @@
-02f629e46dbaa03b58196cced3df07b02c0daf22

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

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

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

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

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

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

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

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 22f24c5fcc97c1ff826ecb66b60bdc01937f6052 CI <CI@example.com> 1652009263 +0200	commit (initial): file0
-22f24c5fcc97c1ff826ecb66b60bdc01937f6052 9e7ff93a5c67a0ef098e9e436961746f333edf98 CI <CI@example.com> 1652009263 +0200	commit: file1
-9e7ff93a5c67a0ef098e9e436961746f333edf98 02f629e46dbaa03b58196cced3df07b02c0daf22 CI <CI@example.com> 1652009263 +0200	commit: file2
-02f629e46dbaa03b58196cced3df07b02c0daf22 02f629e46dbaa03b58196cced3df07b02c0daf22 CI <CI@example.com> 1652009266 +0200	reset: moving to HEAD
-02f629e46dbaa03b58196cced3df07b02c0daf22 02f629e46dbaa03b58196cced3df07b02c0daf22 CI <CI@example.com> 1652009266 +0200	reset: moving to HEAD

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

@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 22f24c5fcc97c1ff826ecb66b60bdc01937f6052 CI <CI@example.com> 1652009263 +0200	commit (initial): file0
-22f24c5fcc97c1ff826ecb66b60bdc01937f6052 9e7ff93a5c67a0ef098e9e436961746f333edf98 CI <CI@example.com> 1652009263 +0200	commit: file1
-9e7ff93a5c67a0ef098e9e436961746f333edf98 02f629e46dbaa03b58196cced3df07b02c0daf22 CI <CI@example.com> 1652009263 +0200	commit: file2

test/integration/discardStagedFiles/expected/repo/.git_keep/objects/22/f24c5fcc97c1ff826ecb66b60bdc01937f6052

@@ -1,3 +0,0 @@
-x
���
-�0=�+�.�&ݦ.�=�3��
-)%��o>��0�ZK�Y�K;
�২�)�q�!Y��1KfSv

test/integration/discardStagedFiles/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448

@@ -1,3 +0,0 @@
-x
+)JMU��d040031QH��I5`������ֶw���w.��h�T�[H
-��e��"Ǩ�S�,��gu"��YH
-�$x~5(�;�rբ����W��-�
Ж+^

test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9d/b161bba78fbd20e7e4ae004be28e40d747726a

@@ -1,2 +0,0 @@
-x
���
-�0D=�+�.�v�n<�3���-5��o.޽

test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9e/7ff93a5c67a0ef098e9e436961746f333edf98

@@ -1,2 +0,0 @@
-x
��A
-�0E]��2�$"BW=F2�����D����>������K�.��"�A"���p)�<i�Tr��=Pȁ�3{9��-�bਣI�T�H•�����OJєOn��f{���|˺����z��"d$o�0�t����nty�3?��9�

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

@@ -1,2 +0,0 @@
-x
+)JMU03c040031QH��I5`������ֶw���w.��h�T�[H
-��y�W5�Ɨ��(�|�
^-�W
(x9

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

@@ -1 +0,0 @@
-02f629e46dbaa03b58196cced3df07b02c0daf22

test/integration/discardStagedFiles/expected/repo/file0

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

test/integration/discardStagedFiles/expected/repo/file1

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

test/integration/discardStagedFiles/expected/repo/file2

@@ -1 +0,0 @@
-hello there

test/integration/discardStagedFiles/expected/repo/file3

@@ -1 +0,0 @@
-hello there

test/integration/discardStagedFiles/recording.json

@@ -1 +0,0 @@
-{"KeyEvents":[{"Timestamp":1175,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1991,"Mod":0,"Key":256,"Ch":68},{"Timestamp":2923,"Mod":0,"Key":256,"Ch":83},{"Timestamp":4453,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":213,"Height":56}]}

test/integration/discardStagedFiles/setup.sh

@@ -1,26 +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
-
-echo "hello there" > file1
-echo "hello there" > file2
-echo "hello there" > file3

test/integration/discardStagedFiles/test.json

@@ -1 +0,0 @@
-{ "description": "Discarding staged changes", "speed": 5 }