test: update stash/rename integration test

2026-08-28 10:15:32 -05:00 · 2022-10-16 16:26:17 +09:00
parent 3103398e31
commit 2ec0b671e6
21 changed files with 27 additions and 14 deletions
@@ -13,7 +13,9 @@ var Rename = NewIntegrationTest(NewIntegrationTestArgs{
 	SetupRepo: func(shell *Shell) {
 		shell.
 			EmptyCommit("blah").
-			CreateFileAndAdd("foo", "change to stash").
+			CreateFileAndAdd("file-1", "change to stash1").
+			StashWithMessage("foo").
+			CreateFileAndAdd("file-2", "change to stash2").
 			StashWithMessage("bar")
 	},
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
@@ -21,13 +23,15 @@ var Rename = NewIntegrationTest(NewIntegrationTestArgs{
 		assert.CurrentViewName("stash")

 		assert.MatchSelectedLine(Equals("On master: bar"))
+		input.NextItem()
+		assert.MatchSelectedLine(Equals("On master: foo"))
 		input.PressKeys(keys.Stash.RenameStash)
 		assert.InPrompt()
-		assert.MatchCurrentViewTitle(Equals("Rename stash: stash@{0}"))
+		assert.MatchCurrentViewTitle(Equals("Rename stash: stash@{1}"))

 		input.Type(" baz")
 		input.Confirm()

-		assert.MatchSelectedLine(Equals("On master: bar baz"))
+		assert.MatchSelectedLine(Equals("On master: foo baz"))
 	},
 })
@@ -1 +1 @@
-8d4897b3dcbb5c8fbc8fa8439ec7e9627c3159cf
+209b9fa9264fa15f128127817f080fd7372050cf
@@ -1,2 +1,3 @@
-0000000000000000000000000000000000000000 8d4897b3dcbb5c8fbc8fa8439ec7e9627c3159cf CI <CI@example.com> 1665802395 +0900	commit (initial): blah
-8d4897b3dcbb5c8fbc8fa8439ec7e9627c3159cf 8d4897b3dcbb5c8fbc8fa8439ec7e9627c3159cf CI <CI@example.com> 1665802396 +0900	reset: moving to HEAD
+0000000000000000000000000000000000000000 209b9fa9264fa15f128127817f080fd7372050cf CI <CI@example.com> 1665905121 +0900	commit (initial): blah
+209b9fa9264fa15f128127817f080fd7372050cf 209b9fa9264fa15f128127817f080fd7372050cf CI <CI@example.com> 1665905122 +0900	reset: moving to HEAD
+209b9fa9264fa15f128127817f080fd7372050cf 209b9fa9264fa15f128127817f080fd7372050cf CI <CI@example.com> 1665905122 +0900	reset: moving to HEAD
@@ -1 +1 @@
-0000000000000000000000000000000000000000 8d4897b3dcbb5c8fbc8fa8439ec7e9627c3159cf CI <CI@example.com> 1665802395 +0900	commit (initial): blah
+0000000000000000000000000000000000000000 209b9fa9264fa15f128127817f080fd7372050cf CI <CI@example.com> 1665905121 +0900	commit (initial): blah
@@ -1 +1,2 @@
-0000000000000000000000000000000000000000 c6f35659c0cf57c794d79df88283d7ee933831dd CI <CI@example.com> 1665802399 +0900	On master: bar baz
+0000000000000000000000000000000000000000 a5272a200897df5558c8cad683c1af14f7184124 CI <CI@example.com> 1665905122 +0900	On master: bar
+a5272a200897df5558c8cad683c1af14f7184124 de8f5ed6f8a58664edfbdecd20b75a6ea0633bf6 CI <CI@example.com> 1665905125 +0900	On master: foo baz
@@ -0,0 +1,3 @@
+x�Í1
+Ã0@ÑÎ>…öB‘]YXPB SŽa9
+)Ä¸züä]?~iµ¾;xzÞúa¤)Ä¥0…¢l*-’®ia	)jF‚äò·oí€i†×4�öËõ³Û£´:€gŽ‚ÑwDwÕkÒíOîtÏ›;¢+¸
@@ -1,2 +0,0 @@
-x�ŽA
-ƒ0E»Î)f_(1ê˜)¥\yŒd2ƒ‚Q±)xüºé¾‹·ù¼�×œ§®ÂKÙE@1ªÚ@šTmDiÈ&vUˆªr«ªf»,|j<u±NcË^ãIðMMÂ�ºŽëª%V>e\wèxôÃKŽ�·Yn¼æ'Tˆ·®&„«%kÍ¹žQEþÔÍ´$9`] ‡÷ùºÿª Îa4_ ËC^
@@ -0,0 +1,4 @@
+x��Э
+Т0�=ч)і.Шю&Mzъcф�L[j�>ОёрныЬ|УжRц
+LњTї�РГ�Rs�й)ЄЇЬ6ЈEVВVдs�лгв@Доfg[�u�И'6=��=цhЄaь0dсоuZwFИ
+у#ЎlЯt	kЙiнYќоТ-Ђhi�ЊщЯЙ���X(юеЈыЯ
@@ -1,2 +0,0 @@
-xŤÍÁ
-Â0€aĎ}ŠÜÉş4$ "ě´ÇhşŚ	+•QÁÇwŹŕőç�ż´Z_/ýp2‰i)L±»iFFOd«,¬Qd5wR¤�?}kL3Ü§ůéß\ß»ßJ«�“`5Á1śőśt˙“Űó~°?+Ę
@@ -0,0 +1,3 @@
+x��½j1„]ßS¨˜ýÑ¯1ÁpÕU~i¥%Ëg.gÈã[.Ò§�ùfvGÖÞ¿wC6ö5Sˆ+{ª¬Ùá‚JIlÅbbòÉôÈ[»� ¤’4§ahF§H)D
+´Dÿxï*¢Ä2.Ž”9x�’ŠŽ’
+¼(Nù¹›™sž—KûÍýqkGYû§Aï]‚÷æÀ4Ô1boÿÄ§ëÝôü3ø“)y{¬OHW
@@ -0,0 +1 @@
+x�Ï±j1ÐÔ÷êfµ’v%LÀ•+Ãž´K‘e.gÈçG�{·Ã›�©£÷ïÝaÌoû¦ê2eá’™“ß(d¶�¼´F5Éj@µ!$^î²ém¡¬Å¤ EŸÌcöÈÙ³Ak!Aµ§�A¢ND±ªúÆ€ Ô™Ñ`ÕcÃ¹/�ýklî|qçË§þI¿ÿè¡Ž~rž(HÑ½CXf:Oìú"_®7×åwú£³1þqHë
@@ -1 +1 @@
-8d4897b3dcbb5c8fbc8fa8439ec7e9627c3159cf
+209b9fa9264fa15f128127817f080fd7372050cf
@@ -1 +1 @@
-c6f35659c0cf57c794d79df88283d7ee933831dd
+de8f5ed6f8a58664edfbdecd20b75a6ea0633bf6
				`@@ -0,0 +1 @@`
				x�Ï±j1ÐÔ÷êfµ’v%LÀ•+Ãž´K‘e.gÈçG�{·Ã›�©£÷ïÝaÌoû¦ê2eá’™“ß(d¶�¼´F5Éj@µ!$^î²ém¡¬Å¤ EŸÌcöÈÙ³Ak!Aµ§�A¢ND±ªúÆ€ Ô™Ñ`ÕcÃ¹/�ýklî\|qçË§þI¿ÿè¡Ž~rž(HÑ½CXf:Oìú"_®7×åwú£³1þqHë