diff options
| author | Jakob Kogler <jakob.kogler@gmail.com> | 2021-12-28 11:13:26 +0100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-07 11:01:42 +1100 |
| commit | 673c4a129626a73b15b55068f1c7cae8efc0e6f1 (patch) | |
| tree | 65812ddc3ed1dcaea105254c7e2fda524ccf823a | |
| parent | ee7a6391a8a9fe0d784857681bd7b33df3c35cab (diff) | |
also test for empty prefill after successful commit
21 files changed, 12 insertions, 12 deletions
diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG index 9daeafb98..2ff0cc013 100644 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/COMMIT_EDITMSG @@ -1 +1 @@ -test +second commit diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/index b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/index Binary files differindex e7625bf65..d31935681 100644 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/index +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/index diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD index 54fca8b62..2bf564e5f 100644 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/HEAD @@ -1 +1,2 @@ -0000000000000000000000000000000000000000 9f4585854e11586ddf73ccab01b7a113b73b022b CI <CI@example.com> 1638960048 +0100 commit (initial): test +0000000000000000000000000000000000000000 c2bf9b666a310383fd7095bc5bd993bba11b040e CI <CI@example.com> 1640438057 +0100 commit (initial): first commit +c2bf9b666a310383fd7095bc5bd993bba11b040e d0ce4cb10cd926f646a08889b077a6d7eddd3534 CI <CI@example.com> 1640438062 +0100 commit: second commit diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master index 54fca8b62..2bf564e5f 100644 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/logs/refs/heads/master @@ -1 +1,2 @@ -0000000000000000000000000000000000000000 9f4585854e11586ddf73ccab01b7a113b73b022b CI <CI@example.com> 1638960048 +0100 commit (initial): test +0000000000000000000000000000000000000000 c2bf9b666a310383fd7095bc5bd993bba11b040e CI <CI@example.com> 1640438057 +0100 commit (initial): first commit +c2bf9b666a310383fd7095bc5bd993bba11b040e d0ce4cb10cd926f646a08889b077a6d7eddd3534 CI <CI@example.com> 1640438062 +0100 commit: second commit diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/6c/493ff740f9380390d5c9ddef4af18697ac9375 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/6c/493ff740f9380390d5c9ddef4af18697ac9375 Binary files differnew file mode 100644 index 000000000..7d217a785 --- /dev/null +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/6c/493ff740f9380390d5c9ddef4af18697ac9375 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb Binary files differdeleted file mode 100644 index 3f22e7000..000000000 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/89/8618af3fef6edf472d0f4a483ed8010d7bcfbb +++ /dev/null diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/8f/f64093f3a08f948519ec374010b7cb7f8416a8 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/8f/f64093f3a08f948519ec374010b7cb7f8416a8 Binary files differdeleted file mode 100644 index c0e2f744d..000000000 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/8f/f64093f3a08f948519ec374010b7cb7f8416a8 +++ /dev/null diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 Binary files differdeleted file mode 100644 index 4667dcf6f..000000000 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 +++ /dev/null diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9f/4585854e11586ddf73ccab01b7a113b73b022b b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9f/4585854e11586ddf73ccab01b7a113b73b022b deleted file mode 100644 index 8d66160f3..000000000 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/9f/4585854e11586ddf73ccab01b7a113b73b022b +++ /dev/null @@ -1,4 +0,0 @@ -xK -0@]dbt -"BW=F>3("u 9{[{x -'DgRkED 2zS.K?{
n=[.;xp AOݙ| d,r
\ No newline at end of file diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/ae/ac8b060acee50f309eb1f6698a981c50bdf493 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/ae/ac8b060acee50f309eb1f6698a981c50bdf493 Binary files differnew file mode 100644 index 000000000..9806bc4bd --- /dev/null +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/ae/ac8b060acee50f309eb1f6698a981c50bdf493 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c2/bf9b666a310383fd7095bc5bd993bba11b040e b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c2/bf9b666a310383fd7095bc5bd993bba11b040e Binary files differnew file mode 100644 index 000000000..e92225048 --- /dev/null +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c2/bf9b666a310383fd7095bc5bd993bba11b040e diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c9/62a96f68e65b4dc8e0fea12db5f9006091efdf b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c9/62a96f68e65b4dc8e0fea12db5f9006091efdf Binary files differnew file mode 100644 index 000000000..285462492 --- /dev/null +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/c9/62a96f68e65b4dc8e0fea12db5f9006091efdf diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/cc/0e7e32912ae6cd02bf3ac092975307d0343e47 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/cc/0e7e32912ae6cd02bf3ac092975307d0343e47 Binary files differdeleted file mode 100644 index 9dd2dfa07..000000000 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/cc/0e7e32912ae6cd02bf3ac092975307d0343e47 +++ /dev/null diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/d0/ce4cb10cd926f646a08889b077a6d7eddd3534 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/d0/ce4cb10cd926f646a08889b077a6d7eddd3534 Binary files differnew file mode 100644 index 000000000..76baa3646 --- /dev/null +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/d0/ce4cb10cd926f646a08889b077a6d7eddd3534 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/e2/129701f1a4d54dc44f03c93bca0a2aec7c5449 b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/e2/129701f1a4d54dc44f03c93bca0a2aec7c5449 Binary files differnew file mode 100644 index 000000000..08245d001 --- /dev/null +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/objects/e2/129701f1a4d54dc44f03c93bca0a2aec7c5449 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master index 773f7766e..13943fa1b 100644 --- a/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master +++ b/test/integration/rememberCommitMessageAfterFail/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -9f4585854e11586ddf73ccab01b7a113b73b022b +d0ce4cb10cd926f646a08889b077a6d7eddd3534 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/file1 b/test/integration/rememberCommitMessageAfterFail/expected/file1 index 9daeafb98..e2129701f 100644 --- a/test/integration/rememberCommitMessageAfterFail/expected/file1 +++ b/test/integration/rememberCommitMessageAfterFail/expected/file1 @@ -1 +1 @@ -test +file1 diff --git a/test/integration/rememberCommitMessageAfterFail/expected/file2 b/test/integration/rememberCommitMessageAfterFail/expected/file2 new file mode 100644 index 000000000..6c493ff74 --- /dev/null +++ b/test/integration/rememberCommitMessageAfterFail/expected/file2 @@ -0,0 +1 @@ +file2 diff --git a/test/integration/rememberCommitMessageAfterFail/recording.json b/test/integration/rememberCommitMessageAfterFail/recording.json index c53f51b8a..39d0fcfa0 100644 --- a/test/integration/rememberCommitMessageAfterFail/recording.json +++ b/test/integration/rememberCommitMessageAfterFail/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":1916,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3421,"Mod":0,"Key":256,"Ch":99},{"Timestamp":3985,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4173,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4442,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4696,"Mod":0,"Key":256,"Ch":116},{"Timestamp":6226,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7698,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10744,"Mod":0,"Key":256,"Ch":100},{"Timestamp":12856,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14484,"Mod":0,"Key":256,"Ch":99},{"Timestamp":15744,"Mod":0,"Key":13,"Ch":13},{"Timestamp":18056,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":209,"Height":52}]}
\ No newline at end of file +{"KeyEvents":[{"Timestamp":1360,"Mod":0,"Key":256,"Ch":106},{"Timestamp":2124,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4000,"Mod":0,"Key":256,"Ch":99},{"Timestamp":4595,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4730,"Mod":0,"Key":256,"Ch":105},{"Timestamp":4831,"Mod":0,"Key":256,"Ch":114},{"Timestamp":5011,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5122,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5552,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5778,"Mod":0,"Key":256,"Ch":99},{"Timestamp":5882,"Mod":0,"Key":256,"Ch":111},{"Timestamp":6046,"Mod":0,"Key":256,"Ch":109},{"Timestamp":6212,"Mod":0,"Key":256,"Ch":109},{"Timestamp":6449,"Mod":0,"Key":256,"Ch":105},{"Timestamp":6550,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7347,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9314,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10322,"Mod":0,"Key":256,"Ch":107},{"Timestamp":11012,"Mod":0,"Key":256,"Ch":100},{"Timestamp":11547,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12960,"Mod":0,"Key":256,"Ch":99},{"Timestamp":13863,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15574,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16365,"Mod":0,"Key":256,"Ch":99},{"Timestamp":16977,"Mod":0,"Key":256,"Ch":115},{"Timestamp":17111,"Mod":0,"Key":256,"Ch":101},{"Timestamp":17308,"Mod":0,"Key":256,"Ch":99},{"Timestamp":17420,"Mod":0,"Key":256,"Ch":111},{"Timestamp":17442,"Mod":0,"Key":256,"Ch":110},{"Timestamp":17593,"Mod":0,"Key":256,"Ch":100},{"Timestamp":17814,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18040,"Mod":0,"Key":256,"Ch":99},{"Timestamp":18127,"Mod":0,"Key":256,"Ch":111},{"Timestamp":18269,"Mod":0,"Key":256,"Ch":109},{"Timestamp":18409,"Mod":0,"Key":256,"Ch":109},{"Timestamp":18694,"Mod":0,"Key":256,"Ch":105},{"Timestamp":18803,"Mod":0,"Key":256,"Ch":116},{"Timestamp":19624,"Mod":0,"Key":13,"Ch":13},{"Timestamp":21204,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":212,"Height":55}]}
\ No newline at end of file diff --git a/test/integration/rememberCommitMessageAfterFail/setup.sh b/test/integration/rememberCommitMessageAfterFail/setup.sh index 934bb98fd..d4c351f63 100644 --- a/test/integration/rememberCommitMessageAfterFail/setup.sh +++ b/test/integration/rememberCommitMessageAfterFail/setup.sh @@ -8,7 +8,8 @@ git config user.name "CI" git checkout -b master -echo "test" > file1 +echo "file1" > file1 +echo "file2" > file2 echo "disruptive" > disruptive cat > .git/hooks/pre-commit <<EOL #!/bin/bash diff --git a/test/integration/rememberCommitMessageAfterFail/test.json b/test/integration/rememberCommitMessageAfterFail/test.json index d5f964568..d9291d7df 100644 --- a/test/integration/rememberCommitMessageAfterFail/test.json +++ b/test/integration/rememberCommitMessageAfterFail/test.json @@ -1 +1 @@ -{ "description": "In this test we attempt to create a commit with the commit message `test`, but a pre-commit hook fails (the hook checks for the existance of a file called `disruptive`). Afterwards we make the pre-commit hook work (by discarding the file), and again attempt to create a commit. This time the commit message should already be remembered from the failed attempt and be prefilled.", "speed": 20 } +{"description": "In this test we attempt to create a commit with the commit message `first commit`, but a pre-commit hook fails (the hook checks for the existance of a file called `disruptive`). Afterwards we make the pre-commit hook work (by discarding the file), and again attempt to create a commit. This time the commit message should already be remembered from the failed attempt and be prefilled. Then another commit is made with the message `second commit`, and this time the last commit message no longer prefilled.", "speed": 20} |