diff options
28 files changed, 24 insertions, 23 deletions
diff --git a/pkg/integration/tests/stash/stash.go b/pkg/integration/tests/stash/stash.go index af247550b..00d666168 100644 --- a/pkg/integration/tests/stash/stash.go +++ b/pkg/integration/tests/stash/stash.go @@ -23,9 +23,11 @@ var Stash = NewIntegrationTest(NewIntegrationTestArgs{ assert.InMenu() input.PressKeys("a") - input.Type("stash name") - input.Confirm() + assert.InPrompt() + assert.MatchCurrentViewTitle(Equals("Stash changes")) + input.Type("my stashed file") + input.Confirm() assert.StashCount(1) assert.WorkingTreeFileCount(0) }, diff --git a/pkg/integration/tests/stash/stash_including_untracked_files.go b/pkg/integration/tests/stash/stash_including_untracked_files.go index 4ed7957ac..2f37f943c 100644 --- a/pkg/integration/tests/stash/stash_including_untracked_files.go +++ b/pkg/integration/tests/stash/stash_including_untracked_files.go @@ -24,9 +24,11 @@ var StashIncludingUntrackedFiles = NewIntegrationTest(NewIntegrationTestArgs{ assert.InMenu() input.PressKeys("U") - input.Type("stash name") - input.Confirm() + assert.InPrompt() + assert.MatchCurrentViewTitle(Equals("Stash changes")) + input.Type("my stashed file") + input.Confirm() assert.StashCount(1) assert.WorkingTreeFileCount(0) }, diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/stash/stash/expected/repo/.git_keep/ORIG_HEAD index bf1549f7e..9130d91a2 100644 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration_new/stash/stash/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -6227ee90e6cf6047b510f13dc6cc976e2dd372dd +e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/HEAD b/test/integration_new/stash/stash/expected/repo/.git_keep/logs/HEAD index 276b4169c..e89e8b09a 100644 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/HEAD +++ b/test/integration_new/stash/stash/expected/repo/.git_keep/logs/HEAD @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 6227ee90e6cf6047b510f13dc6cc976e2dd372dd CI <CI@example.com> 1665104980 -0230 commit (initial): initial commit -6227ee90e6cf6047b510f13dc6cc976e2dd372dd 6227ee90e6cf6047b510f13dc6cc976e2dd372dd CI <CI@example.com> 1665104985 -0230 reset: moving to HEAD +0000000000000000000000000000000000000000 e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 CI <CI@example.com> 1668288675 -0330 commit (initial): initial commit +e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 CI <CI@example.com> 1668288676 -0330 reset: moving to HEAD diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/heads/master index b4cda7b51..79820d14f 100644 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/heads/master +++ b/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/heads/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 6227ee90e6cf6047b510f13dc6cc976e2dd372dd CI <CI@example.com> 1665104980 -0230 commit (initial): initial commit +0000000000000000000000000000000000000000 e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 CI <CI@example.com> 1668288675 -0330 commit (initial): initial commit diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/stash b/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/stash index 080ed95ff..6933fca6b 100644 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/stash +++ b/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/stash @@ -1 +1 @@ -0000000000000000000000000000000000000000 9ca683cf1ae1a37fb25ec24646acc0dc1db376e7 CI <CI@example.com> 1665104985 -0230 On master: stash name +0000000000000000000000000000000000000000 c86eeda485a49ca608cb2617bb027be66cd92bc3 CI <CI@example.com> 1668288676 -0330 On master: my stashed file diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/62/27ee90e6cf6047b510f13dc6cc976e2dd372dd b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/62/27ee90e6cf6047b510f13dc6cc976e2dd372dd Binary files differdeleted file mode 100644 index 498500cc1..000000000 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/62/27ee90e6cf6047b510f13dc6cc976e2dd372dd +++ /dev/null diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/9c/a683cf1ae1a37fb25ec24646acc0dc1db376e7 b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/9c/a683cf1ae1a37fb25ec24646acc0dc1db376e7 deleted file mode 100644 index 229d54ce7..000000000 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/9c/a683cf1ae1a37fb25ec24646acc0dc1db376e7 +++ /dev/null @@ -1 +0,0 @@ -xj1DSW$J2!\7HDwN|ոO3fBM"J&ַ$*j -:
1PfhER`RfѨ³ZbhjH\eAcM%ʒpzֿ![<W\.ӝ'_W @M
\ No newline at end of file diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/b4/ba8c398d35c204cc9ae06e120c6f0801fd3f32 b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/b4/ba8c398d35c204cc9ae06e120c6f0801fd3f32 new file mode 100644 index 000000000..e75cf01e2 --- /dev/null +++ b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/b4/ba8c398d35c204cc9ae06e120c6f0801fd3f32 @@ -0,0 +1 @@ +xAj0E) cI@V>X3"9~l?=^ZSUA HdrN/)ra,sX̃w];()ÁkDQ0(߷n|ߦ=@mc=~x7u}B߃^y?yNFY
\ No newline at end of file diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/c8/6eeda485a49ca608cb2617bb027be66cd92bc3 b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/c8/6eeda485a49ca608cb2617bb027be66cd92bc3 Binary files differnew file mode 100644 index 000000000..330924b9f --- /dev/null +++ b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/c8/6eeda485a49ca608cb2617bb027be66cd92bc3 diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/e6/ed7d5c2198fa4791de9c66e8000da607eaf9a3 b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/e6/ed7d5c2198fa4791de9c66e8000da607eaf9a3 Binary files differnew file mode 100644 index 000000000..e53b1e068 --- /dev/null +++ b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/e6/ed7d5c2198fa4791de9c66e8000da607eaf9a3 diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/f3/30ace8ec625fc87fe24138f3c4d65e7e8d9b8c b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/f3/30ace8ec625fc87fe24138f3c4d65e7e8d9b8c Binary files differdeleted file mode 100644 index c63423382..000000000 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/f3/30ace8ec625fc87fe24138f3c4d65e7e8d9b8c +++ /dev/null diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/refs/heads/master b/test/integration_new/stash/stash/expected/repo/.git_keep/refs/heads/master index bf1549f7e..9130d91a2 100644 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/refs/heads/master +++ b/test/integration_new/stash/stash/expected/repo/.git_keep/refs/heads/master @@ -1 +1 @@ -6227ee90e6cf6047b510f13dc6cc976e2dd372dd +e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/refs/stash b/test/integration_new/stash/stash/expected/repo/.git_keep/refs/stash index c03c37c76..a976f263d 100644 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/refs/stash +++ b/test/integration_new/stash/stash/expected/repo/.git_keep/refs/stash @@ -1 +1 @@ -9ca683cf1ae1a37fb25ec24646acc0dc1db376e7 +c86eeda485a49ca608cb2617bb027be66cd92bc3 diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/ORIG_HEAD index 4ee40e25d..8b6d164d8 100644 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -d25b2c8a3d20c1b1884fbf1c87aa2014dd99ed7f +364ac39500dfec09956626a513736d7602b4d64a diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/HEAD b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/HEAD index e8dcfb6d1..1350d45f0 100644 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/HEAD +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/HEAD @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 d25b2c8a3d20c1b1884fbf1c87aa2014dd99ed7f CI <CI@example.com> 1665105632 -0230 commit (initial): initial commit -d25b2c8a3d20c1b1884fbf1c87aa2014dd99ed7f d25b2c8a3d20c1b1884fbf1c87aa2014dd99ed7f CI <CI@example.com> 1665105633 -0230 reset: moving to HEAD +0000000000000000000000000000000000000000 364ac39500dfec09956626a513736d7602b4d64a CI <CI@example.com> 1668288767 -0330 commit (initial): initial commit +364ac39500dfec09956626a513736d7602b4d64a 364ac39500dfec09956626a513736d7602b4d64a CI <CI@example.com> 1668288768 -0330 reset: moving to HEAD diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/heads/master index df042a3dd..9653f3a4b 100644 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/heads/master +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/heads/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 d25b2c8a3d20c1b1884fbf1c87aa2014dd99ed7f CI <CI@example.com> 1665105632 -0230 commit (initial): initial commit +0000000000000000000000000000000000000000 364ac39500dfec09956626a513736d7602b4d64a CI <CI@example.com> 1668288767 -0330 commit (initial): initial commit diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/stash b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/stash index 335d6aab8..9fa56fb7b 100644 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/stash +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/stash @@ -1 +1 @@ -0000000000000000000000000000000000000000 b8eb39e727d4ac91542d57faa0bea0458c2d30e3 CI <CI@example.com> 1665105633 -0230 On master: stash name +0000000000000000000000000000000000000000 03892119fb6b807d1c13c23f6baacdc4a170e694 CI <CI@example.com> 1668288768 -0330 On master: my stashed file diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/03/892119fb6b807d1c13c23f6baacdc4a170e694 b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/03/892119fb6b807d1c13c23f6baacdc4a170e694 new file mode 100644 index 000000000..c933b47b3 --- /dev/null +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/03/892119fb6b807d1c13c23f6baacdc4a170e694 @@ -0,0 +1 @@ +x=jA{@_2!\F# <^@rL>__Ǹ.U'%KK>W&F˽=6ÒZĴQ.%}H-84OS$uK 4C&45TC~z0lYEIQ4kK\s0ҾpǓ{?>U:>/b-^!FX:OO|h7~ݶr?].
\ No newline at end of file diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/0f/e7bff1bede9ebb8de52517a4b75ad0f80be423 b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/0f/e7bff1bede9ebb8de52517a4b75ad0f80be423 Binary files differnew file mode 100644 index 000000000..aacb0bb13 --- /dev/null +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/0f/e7bff1bede9ebb8de52517a4b75ad0f80be423 diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/36/4ac39500dfec09956626a513736d7602b4d64a b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/36/4ac39500dfec09956626a513736d7602b4d64a Binary files differnew file mode 100644 index 000000000..000dd1faf --- /dev/null +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/36/4ac39500dfec09956626a513736d7602b4d64a diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/8d/147cc9d3f9cf40d1723b9099b98ffdb3727f8b b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/8d/147cc9d3f9cf40d1723b9099b98ffdb3727f8b Binary files differnew file mode 100644 index 000000000..84ee6636f --- /dev/null +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/8d/147cc9d3f9cf40d1723b9099b98ffdb3727f8b diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/9d/49589525f6c37d177a53a57d82603a22de6076 b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/9d/49589525f6c37d177a53a57d82603a22de6076 Binary files differdeleted file mode 100644 index 99fe3e9e5..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/9d/49589525f6c37d177a53a57d82603a22de6076 +++ /dev/null diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/b8/eb39e727d4ac91542d57faa0bea0458c2d30e3 b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/b8/eb39e727d4ac91542d57faa0bea0458c2d30e3 deleted file mode 100644 index eb6b19046..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/b8/eb39e727d4ac91542d57faa0bea0458c2d30e3 +++ /dev/null @@ -1,2 +0,0 @@ -xMJ1`}\@#"¬f* -#;Ƿ7wx1nT-"F9R:S(T2cdMr锸R╠aŜC[N"TK1M¹0q'ŔpL Ň)K>Kj*3A°ϼm\a2Ҷ0FF{yz?!_1帹UY`
\ No newline at end of file diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/d2/5b2c8a3d20c1b1884fbf1c87aa2014dd99ed7f b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/d2/5b2c8a3d20c1b1884fbf1c87aa2014dd99ed7f Binary files differdeleted file mode 100644 index d412fdb69..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/d2/5b2c8a3d20c1b1884fbf1c87aa2014dd99ed7f +++ /dev/null diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/f8/528a899ebb020e575e007426baa4535207a214 b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/f8/528a899ebb020e575e007426baa4535207a214 deleted file mode 100644 index 8cc3c848b..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/f8/528a899ebb020e575e007426baa4535207a214 +++ /dev/null @@ -1,2 +0,0 @@ -x] -0})J~7A}16o6|C@pjsޓBIo5Z,&RҖ04|B+ўuqajBtJ:4R)zOcm[PW(q+%M[:
\ No newline at end of file diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/heads/master b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/heads/master index 4ee40e25d..8b6d164d8 100644 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/heads/master +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/heads/master @@ -1 +1 @@ -d25b2c8a3d20c1b1884fbf1c87aa2014dd99ed7f +364ac39500dfec09956626a513736d7602b4d64a diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/stash b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/stash index 3e0f2a550..3512c8618 100644 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/stash +++ b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/stash @@ -1 +1 @@ -b8eb39e727d4ac91542d57faa0bea0458c2d30e3 +03892119fb6b807d1c13c23f6baacdc4a170e694 |