From f2d0f362d438b965fc1871f07f8373c5ce0af453 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 28 Dec 2022 13:24:23 +1100 Subject: [PATCH] migrate discard staged changes test --- pkg/integration/components/file_system.go | 23 ++++++++ .../tests/file/discard_staged_changes.go | 52 ++++++++++++++++++ pkg/integration/tests/tests.go | 1 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 8 --- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 262 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 -- .../expected/repo/.git_keep/logs/HEAD | 5 -- .../repo/.git_keep/logs/refs/heads/master | 3 - .../02/f629e46dbaa03b58196cced3df07b02c0daf22 | Bin 147 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../22/f24c5fcc97c1ff826ecb66b60bdc01937f6052 | 3 - .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 | Bin 81 -> 0 bytes .../5e/2f5743436bdc7602aa3486d5ff294940603c3d | Bin 198 -> 0 bytes .../66/bbc809cdafd867cf9320bfb7484bb8fa898448 | 3 - .../9d/b161bba78fbd20e7e4ae004be28e40d747726a | 2 - .../9e/7ff93a5c67a0ef098e9e436961746f333edf98 | 2 - .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../c7/c7da3c64e86c3270f2639a1379e67e14891b6a | Bin 28 -> 0 bytes .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 - .../e3/18207cf3da045ce47e2632a5326b61030a2c8e | Bin 189 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../discardStagedFiles/expected/repo/file0 | 1 - .../discardStagedFiles/expected/repo/file1 | 1 - .../discardStagedFiles/expected/repo/file2 | 1 - .../discardStagedFiles/expected/repo/file3 | 1 - .../discardStagedFiles/recording.json | 1 - test/integration/discardStagedFiles/setup.sh | 26 --------- test/integration/discardStagedFiles/test.json | 1 - 36 files changed, 76 insertions(+), 71 deletions(-) create mode 100644 pkg/integration/tests/file/discard_staged_changes.go delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/config delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/description delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/index delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/02/f629e46dbaa03b58196cced3df07b02c0daf22 delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/22/f24c5fcc97c1ff826ecb66b60bdc01937f6052 delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/5e/2f5743436bdc7602aa3486d5ff294940603c3d delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9d/b161bba78fbd20e7e4ae004be28e40d747726a delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9e/7ff93a5c67a0ef098e9e436961746f333edf98 delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/objects/e3/18207cf3da045ce47e2632a5326b61030a2c8e delete mode 100644 test/integration/discardStagedFiles/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/discardStagedFiles/expected/repo/file0 delete mode 100644 test/integration/discardStagedFiles/expected/repo/file1 delete mode 100644 test/integration/discardStagedFiles/expected/repo/file2 delete mode 100644 test/integration/discardStagedFiles/expected/repo/file3 delete mode 100644 test/integration/discardStagedFiles/recording.json delete mode 100644 test/integration/discardStagedFiles/setup.sh delete mode 100644 test/integration/discardStagedFiles/test.json diff --git a/pkg/integration/components/file_system.go b/pkg/integration/components/file_system.go index 040234e77..ea9a2e929 100644 --- a/pkg/integration/components/file_system.go +++ b/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, "" + }) +} diff --git a/pkg/integration/tests/file/discard_staged_changes.go b/pkg/integration/tests/file/discard_staged_changes.go new file mode 100644 index 000000000..180dc45b4 --- /dev/null +++ b/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")) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index c550c2a0c..9278ade2b 100644 --- a/pkg/integration/tests/tests.go +++ b/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, diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/discardStagedFiles/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/FETCH_HEAD b/test/integration/discardStagedFiles/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/HEAD b/test/integration/discardStagedFiles/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/ORIG_HEAD b/test/integration/discardStagedFiles/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index c3e34c41d..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -02f629e46dbaa03b58196cced3df07b02c0daf22 diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/config b/test/integration/discardStagedFiles/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/description b/test/integration/discardStagedFiles/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/index b/test/integration/discardStagedFiles/expected/repo/.git_keep/index deleted file mode 100644 index be47b03227c3338590ec668645dbca0f8610495c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmZ?q402{*U|<4b=A`nK`lih%Zo+7wm=vS%I$;Ke#w9@M7ZA+AW+7sAWx+qKZSR5) zz3*Il^U>a^rneYa(=u~X4S-tk0gyQeuyoJkzpAM>zC?sZ@#H&Q2=Hp@z6vqN5TOVw z3)LJ6o*zaHO8d^eT(u~?s=wux_IwLi|1=T+Kf^#< diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/info/exclude b/test/integration/discardStagedFiles/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -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] -# *~ diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/logs/HEAD b/test/integration/discardStagedFiles/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 9afe44c14..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 22f24c5fcc97c1ff826ecb66b60bdc01937f6052 CI 1652009263 +0200 commit (initial): file0 -22f24c5fcc97c1ff826ecb66b60bdc01937f6052 9e7ff93a5c67a0ef098e9e436961746f333edf98 CI 1652009263 +0200 commit: file1 -9e7ff93a5c67a0ef098e9e436961746f333edf98 02f629e46dbaa03b58196cced3df07b02c0daf22 CI 1652009263 +0200 commit: file2 -02f629e46dbaa03b58196cced3df07b02c0daf22 02f629e46dbaa03b58196cced3df07b02c0daf22 CI 1652009266 +0200 reset: moving to HEAD -02f629e46dbaa03b58196cced3df07b02c0daf22 02f629e46dbaa03b58196cced3df07b02c0daf22 CI 1652009266 +0200 reset: moving to HEAD diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/discardStagedFiles/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index e5e4b05c6..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 22f24c5fcc97c1ff826ecb66b60bdc01937f6052 CI 1652009263 +0200 commit (initial): file0 -22f24c5fcc97c1ff826ecb66b60bdc01937f6052 9e7ff93a5c67a0ef098e9e436961746f333edf98 CI 1652009263 +0200 commit: file1 -9e7ff93a5c67a0ef098e9e436961746f333edf98 02f629e46dbaa03b58196cced3df07b02c0daf22 CI 1652009263 +0200 commit: file2 diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/02/f629e46dbaa03b58196cced3df07b02c0daf22 b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/02/f629e46dbaa03b58196cced3df07b02c0daf22 deleted file mode 100644 index 5dd10885d211e1167ef8d7849fc3cbb25d8e9983..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93d0}}0DJZo-U~(7M0cT-LQZ+cMt5l-HX&H(^Xn6O8-_Vd-fLZ( z^#qr8idYgvPOfAu2&Dk)qGfbGMbU)f5g{xYvN`yack6vprNCp3iJhn;6p|rCiarfd zLkLoo(D0|d_R~(Yy-)K~zFdz@Zh5Z{>*EN{5yW7xu9NAuPc`{7H@a>D<_FBGIqQ6K BL~ZE#08nZNMgRZ+ diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/22/f24c5fcc97c1ff826ecb66b60bdc01937f6052 b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/22/f24c5fcc97c1ff826ecb66b60bdc01937f6052 deleted file mode 100644 index f4e1952b1..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/22/f24c5fcc97c1ff826ecb66b60bdc01937f6052 +++ /dev/null @@ -1,3 +0,0 @@ -x -0=+.&ݦ.=3 )%o>0 ZKYK;২)q!Y1KfSv -Qg§IByyʱ$GǬtN>i37y2+ \ No newline at end of file diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb|y2)08mZ`J^%m! diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 deleted file mode 100644 index 6a6f2436255b8a831b87262c4d030c7d63af046b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U nND2%Yjvv2elky_RsNhrbEaA#$bt0Y8Sx5?uuqprm;XNz0$Rj03 diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/5e/2f5743436bdc7602aa3486d5ff294940603c3d b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/5e/2f5743436bdc7602aa3486d5ff294940603c3d deleted file mode 100644 index 7aee98aa9a564f30376587951581c8472747d52f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmV;%06G770gaDAN&`UhpYDPu1Y{rRcb$fKD?sa6O*dQe9U<|H1l#1JE~4*Jnf%L<1hJRXkE{;Bir z;tzS5pJ3!2Atqvmd+clIw4Z4HPknf~!mL~O_wahr@2~fBdxNd%c7os353$Qq*X#;i AWdHyG diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 deleted file mode 100644 index c84b87a17..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 +++ /dev/null @@ -1,3 +0,0 @@ -x+)JMUd040031QHI5`ֶww.hT[H - e"ǨS,gu"YH -$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9d/b161bba78fbd20e7e4ae004be28e40d747726a b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9d/b161bba78fbd20e7e4ae004be28e40d747726a deleted file mode 100644 index c5c3d1d48..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9d/b161bba78fbd20e7e4ae004be28e40d747726a +++ /dev/null @@ -1,2 +0,0 @@ -x -0D=+.vn<3 -5o.޽ üŵu,BNǘ}O(YF묈yg3[uZN2sqȄw};'ܧ~BٞzkB!zb#dZۤ97%uYAJ  BP \ No newline at end of file diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9e/7ff93a5c67a0ef098e9e436961746f333edf98 b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9e/7ff93a5c67a0ef098e9e436961746f333edf98 deleted file mode 100644 index 1c2077cd7..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/9e/7ff93a5c67a0ef098e9e436961746f333edf98 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E] 2$"BW=F2D>K."A" p)=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a deleted file mode 100644 index ee4385f12cb5e2fea6044749c3960a2c40be7b9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb4eAGlPAM9PI~BiJ!N8W-osW20IwDcng9R* diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/e3/18207cf3da045ce47e2632a5326b61030a2c8e b/test/integration/discardStagedFiles/expected/repo/.git_keep/objects/e3/18207cf3da045ce47e2632a5326b61030a2c8e deleted file mode 100644 index 80258c14d84beb0bf8a3919bd3f90707c3ee3540..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmV;u07CzG0gaEbY6LM11yk==s1F2L>y_6>2!X4%OP5-*WO8u6JvI*H^W*0FbdSeO zF=cP<(t((s`r!^s@tUQ&u*}KUTr(|B(Y2-^=0$n7P%%w+IsDcEsWN4cY$}4YE^EkK zirZ|1Qlx?=mFU4|)4)Mh(puFBJ$V#IjOw&{L`yLxVwvQpf9(gHH+Vg7@BS<8e)X5K rw>Jp95Mm}~c*e1&@s5b@|HP-y?F053H2EIR>Cpi7a&`IxpH@%G6!Br5 diff --git a/test/integration/discardStagedFiles/expected/repo/.git_keep/refs/heads/master b/test/integration/discardStagedFiles/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index c3e34c41d..000000000 --- a/test/integration/discardStagedFiles/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -02f629e46dbaa03b58196cced3df07b02c0daf22 diff --git a/test/integration/discardStagedFiles/expected/repo/file0 b/test/integration/discardStagedFiles/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/discardStagedFiles/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/discardStagedFiles/expected/repo/file1 b/test/integration/discardStagedFiles/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/discardStagedFiles/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/discardStagedFiles/expected/repo/file2 b/test/integration/discardStagedFiles/expected/repo/file2 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/discardStagedFiles/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/discardStagedFiles/expected/repo/file3 b/test/integration/discardStagedFiles/expected/repo/file3 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/discardStagedFiles/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/discardStagedFiles/recording.json b/test/integration/discardStagedFiles/recording.json deleted file mode 100644 index 5abd7e1a8..000000000 --- a/test/integration/discardStagedFiles/recording.json +++ /dev/null @@ -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}]} \ No newline at end of file diff --git a/test/integration/discardStagedFiles/setup.sh b/test/integration/discardStagedFiles/setup.sh deleted file mode 100644 index caff56b7d..000000000 --- a/test/integration/discardStagedFiles/setup.sh +++ /dev/null @@ -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 diff --git a/test/integration/discardStagedFiles/test.json b/test/integration/discardStagedFiles/test.json deleted file mode 100644 index 9edc4a815..000000000 --- a/test/integration/discardStagedFiles/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Discarding staged changes", "speed": 5 }