go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-23 00:39:13 +02:00
Code Issues Releases Activity

refactor integration tests

Browse Source
This commit is contained in:
Jesse Duffield
2022-03-27 11:47:07 +11:00
parent 2b3d457aa4
commit 20ec6d98ad
3991 changed files with 1205 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/pullAndSetUpstream/expected/.git_keep/FETCH_HEAD
View File

@ -1 +0,0 @@
766e681a51daa75233c1c4ae8845be2c893577d5 branch 'master' of ../actual_remote

1
test/integration/pullAndSetUpstream/expected/.git_keep/ORIG_HEAD
View File

@ -1 +0,0 @@
c9fd61f40de25556977e063683d1de612f931ccb

BIN
test/integration/pullAndSetUpstream/expected/.git_keep/index
View File

Binary file not shown.

7
test/integration/pullAndSetUpstream/expected/.git_keep/logs/HEAD
View File

@ -1,7 +0,0 @@
0000000000000000000000000000000000000000 972fb9caab8b8536ae38687fec98304b76748b9d CI <CI@example.com> 1642217132 +1100 commit (initial): myfile1
972fb9caab8b8536ae38687fec98304b76748b9d c9fd61f40de25556977e063683d1de612f931ccb CI <CI@example.com> 1642217132 +1100 commit: myfile2
c9fd61f40de25556977e063683d1de612f931ccb 06d3929607b7519beb45ca67165a1f2b5c0e578b CI <CI@example.com> 1642217132 +1100 commit: myfile3
06d3929607b7519beb45ca67165a1f2b5c0e578b 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217132 +1100 commit: myfile4
766e681a51daa75233c1c4ae8845be2c893577d5 c9fd61f40de25556977e063683d1de612f931ccb CI <CI@example.com> 1642217132 +1100 reset: moving to HEAD~2
c9fd61f40de25556977e063683d1de612f931ccb 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217139 +1100 rebase -i (start): checkout 766e681a51daa75233c1c4ae8845be2c893577d5
766e681a51daa75233c1c4ae8845be2c893577d5 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217139 +1100 rebase -i (finish): returning to refs/heads/master

6
test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/heads/master
View File

@ -1,6 +0,0 @@
0000000000000000000000000000000000000000 972fb9caab8b8536ae38687fec98304b76748b9d CI <CI@example.com> 1642217132 +1100 commit (initial): myfile1
972fb9caab8b8536ae38687fec98304b76748b9d c9fd61f40de25556977e063683d1de612f931ccb CI <CI@example.com> 1642217132 +1100 commit: myfile2
c9fd61f40de25556977e063683d1de612f931ccb 06d3929607b7519beb45ca67165a1f2b5c0e578b CI <CI@example.com> 1642217132 +1100 commit: myfile3
06d3929607b7519beb45ca67165a1f2b5c0e578b 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217132 +1100 commit: myfile4
766e681a51daa75233c1c4ae8845be2c893577d5 c9fd61f40de25556977e063683d1de612f931ccb CI <CI@example.com> 1642217132 +1100 reset: moving to HEAD~2
c9fd61f40de25556977e063683d1de612f931ccb 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217139 +1100 rebase -i (finish): refs/heads/master onto 766e681a51daa75233c1c4ae8845be2c893577d5

1
test/integration/pullAndSetUpstream/expected/.git_keep/logs/refs/remotes/origin/master
View File

@ -1 +0,0 @@
0000000000000000000000000000000000000000 766e681a51daa75233c1c4ae8845be2c893577d5 CI <CI@example.com> 1642217132 +1100 fetch origin: storing head

BIN
test/integration/pullAndSetUpstream/expected/.git_keep/objects/06/d3929607b7519beb45ca67165a1f2b5c0e578b
View File

Binary file not shown.

BIN
test/integration/pullAndSetUpstream/expected/.git_keep/objects/76/6e681a51daa75233c1c4ae8845be2c893577d5
View File

Binary file not shown.

BIN
test/integration/pullAndSetUpstream/expected/.git_keep/objects/97/2fb9caab8b8536ae38687fec98304b76748b9d
View File

Binary file not shown.

BIN
test/integration/pullAndSetUpstream/expected/.git_keep/objects/c9/fd61f40de25556977e063683d1de612f931ccb
View File

Binary file not shown.

1
test/integration/pullAndSetUpstream/expected/.git_keep/refs/heads/master
View File

@ -1 +0,0 @@
766e681a51daa75233c1c4ae8845be2c893577d5

1
test/integration/pullAndSetUpstream/expected/.git_keep/refs/remotes/origin/master
View File

@ -1 +0,0 @@
766e681a51daa75233c1c4ae8845be2c893577d5

0
test/integration/pullAndSetUpstream/expected/.git_keep/HEAD → test/integration/pullAndSetUpstream/expected/origin/HEAD
View File

2
test/integration/pullAndSetUpstream/expected_remote/config → test/integration/pullAndSetUpstream/expected/origin/config
View File

@ -5,4 +5,4 @@
ignorecase = true
precomposeunicode = true
[remote "origin"]
url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullAndSetUpstream/./actual
url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullAndSetUpstream/actual/./repo

0
test/integration/pullAndSetUpstream/expected/.git_keep/description → test/integration/pullAndSetUpstream/expected/origin/description
View File

0
test/integration/pullAndSetUpstream/expected/.git_keep/info/exclude → test/integration/pullAndSetUpstream/expected/origin/info/exclude
View File

0
test/integration/pullAndSetUpstream/expected/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 → test/integration/pullAndSetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
View File

0
test/integration/pullAndSetUpstream/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 → test/integration/pullAndSetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
View File

2
test/integration/pullAndSetUpstream/expected/origin/objects/1f/027c0e280612f8e5e2cf0a5361f6ab0c4baed6 Normal file
View File

@ -0,0 +1,2 @@
x��A
�0@Ѯs��JF��))��1�P�!")���#t�y�S5[ ������S����P�D��Y��X��g�ӽs���u�q��8�􈶭zK�@&�I\�wg='M��ξeY�3�,�

0
test/integration/pullAndSetUpstream/expected/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce → test/integration/pullAndSetUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
View File

0
test/integration/pullAndSetUpstream/expected/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 → test/integration/pullAndSetUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591
View File

BIN
test/integration/pullAndSetUpstream/expected/origin/objects/64/d950eb46bf13d35cd27dd7a3ad621422dee6ac Normal file
View File

Binary file not shown.

0
test/integration/pullAndSetUpstream/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 → test/integration/pullAndSetUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
View File

0
test/integration/pullAndSetUpstream/expected/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 → test/integration/pullAndSetUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
View File

0
test/integration/pullAndSetUpstream/expected/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 → test/integration/pullAndSetUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
View File

0
test/integration/pullAndSetUpstream/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b → test/integration/pullAndSetUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
View File

BIN
test/integration/pullAndSetUpstream/expected/origin/objects/df/fd8a2962e840dfcbce39a0315e0cded7873b29 Normal file
View File

Binary file not shown.

BIN
test/integration/pullAndSetUpstream/expected/origin/objects/f1/1c72f0484c803d954446036bf464c3b8523330 Normal file
View File

Binary file not shown.

2
test/integration/pullAndSetUpstream/expected/origin/packed-refs Normal file
View File

@ -0,0 +1,2 @@
# pack-refs with: peeled fully-peeled sorted
dffd8a2962e840dfcbce39a0315e0cded7873b29 refs/heads/master

0
test/integration/pullAndSetUpstream/expected/.git_keep/COMMIT_EDITMSG → test/integration/pullAndSetUpstream/expected/repo/.git_keep/COMMIT_EDITMSG
View File

1
test/integration/pullAndSetUpstream/expected/repo/.git_keep/FETCH_HEAD Normal file
View File

@ -0,0 +1 @@
dffd8a2962e840dfcbce39a0315e0cded7873b29 branch 'master' of ../origin

0
test/integration/pullAndSetUpstream/expected_remote/HEAD → test/integration/pullAndSetUpstream/expected/repo/.git_keep/HEAD
View File

1
test/integration/pullAndSetUpstream/expected/repo/.git_keep/ORIG_HEAD Normal file
View File

@ -0,0 +1 @@
f11c72f0484c803d954446036bf464c3b8523330

2
test/integration/pullAndSetUpstream/expected/.git_keep/config → test/integration/pullAndSetUpstream/expected/repo/.git_keep/config
View File

@ -9,7 +9,7 @@
email = CI@example.com
name = CI
[remote "origin"]
url = ../actual_remote
url = ../origin
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin

0
test/integration/pullAndSetUpstream/expected_remote/description → test/integration/pullAndSetUpstream/expected/repo/.git_keep/description
View File

BIN
test/integration/pullAndSetUpstream/expected/repo/.git_keep/index Normal file
View File

Binary file not shown.

0
test/integration/pullAndSetUpstream/expected_remote/info/exclude → test/integration/pullAndSetUpstream/expected/repo/.git_keep/info/exclude
View File

7
test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/HEAD Normal file
View File

@ -0,0 +1,7 @@
0000000000000000000000000000000000000000 1f027c0e280612f8e5e2cf0a5361f6ab0c4baed6 CI <CI@example.com> 1648348714 +1100 commit (initial): myfile1
1f027c0e280612f8e5e2cf0a5361f6ab0c4baed6 f11c72f0484c803d954446036bf464c3b8523330 CI <CI@example.com> 1648348714 +1100 commit: myfile2
f11c72f0484c803d954446036bf464c3b8523330 64d950eb46bf13d35cd27dd7a3ad621422dee6ac CI <CI@example.com> 1648348715 +1100 commit: myfile3
64d950eb46bf13d35cd27dd7a3ad621422dee6ac dffd8a2962e840dfcbce39a0315e0cded7873b29 CI <CI@example.com> 1648348715 +1100 commit: myfile4
dffd8a2962e840dfcbce39a0315e0cded7873b29 f11c72f0484c803d954446036bf464c3b8523330 CI <CI@example.com> 1648348715 +1100 reset: moving to HEAD~2
f11c72f0484c803d954446036bf464c3b8523330 dffd8a2962e840dfcbce39a0315e0cded7873b29 CI <CI@example.com> 1648348721 +1100 rebase -i (start): checkout dffd8a2962e840dfcbce39a0315e0cded7873b29
dffd8a2962e840dfcbce39a0315e0cded7873b29 dffd8a2962e840dfcbce39a0315e0cded7873b29 CI <CI@example.com> 1648348721 +1100 rebase -i (finish): returning to refs/heads/master

6
test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/refs/heads/master Normal file
View File

@ -0,0 +1,6 @@
0000000000000000000000000000000000000000 1f027c0e280612f8e5e2cf0a5361f6ab0c4baed6 CI <CI@example.com> 1648348714 +1100 commit (initial): myfile1
1f027c0e280612f8e5e2cf0a5361f6ab0c4baed6 f11c72f0484c803d954446036bf464c3b8523330 CI <CI@example.com> 1648348714 +1100 commit: myfile2
f11c72f0484c803d954446036bf464c3b8523330 64d950eb46bf13d35cd27dd7a3ad621422dee6ac CI <CI@example.com> 1648348715 +1100 commit: myfile3
64d950eb46bf13d35cd27dd7a3ad621422dee6ac dffd8a2962e840dfcbce39a0315e0cded7873b29 CI <CI@example.com> 1648348715 +1100 commit: myfile4
dffd8a2962e840dfcbce39a0315e0cded7873b29 f11c72f0484c803d954446036bf464c3b8523330 CI <CI@example.com> 1648348715 +1100 reset: moving to HEAD~2
f11c72f0484c803d954446036bf464c3b8523330 dffd8a2962e840dfcbce39a0315e0cded7873b29 CI <CI@example.com> 1648348721 +1100 rebase -i (finish): refs/heads/master onto dffd8a2962e840dfcbce39a0315e0cded7873b29

1
test/integration/pullAndSetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master Normal file
View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000 dffd8a2962e840dfcbce39a0315e0cded7873b29 CI <CI@example.com> 1648348715 +1100 fetch origin: storing head

0
test/integration/pullAndSetUpstream/expected_remote/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 → test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52
View File

0
test/integration/pullAndSetUpstream/expected_remote/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 → test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827
View File

2
test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/1f/027c0e280612f8e5e2cf0a5361f6ab0c4baed6 Normal file
View File

@ -0,0 +1,2 @@
x��A
�0@Ѯs��JF��))��1�P�!")���#t�y�S5[ ������S����P�D��Y��X��g�ӽs���u�q��8�􈶭zK�@&�I\�wg='M��ξeY�3�,�

0
test/integration/pullAndSetUpstream/expected_remote/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce → test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce
View File

0
test/integration/pullAndSetUpstream/expected_remote/objects/2f/6174050380438f14b16658a356e762435ca591 → test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591
View File

BIN
test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/64/d950eb46bf13d35cd27dd7a3ad621422dee6ac Normal file
View File

Binary file not shown.

0
test/integration/pullAndSetUpstream/expected_remote/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 → test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5
View File

0
test/integration/pullAndSetUpstream/expected_remote/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 → test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416
View File

0
test/integration/pullAndSetUpstream/expected_remote/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 → test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54
View File

0
test/integration/pullAndSetUpstream/expected_remote/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b → test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b
View File

BIN
test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/df/fd8a2962e840dfcbce39a0315e0cded7873b29 Normal file
View File

Binary file not shown.

BIN
test/integration/pullAndSetUpstream/expected/repo/.git_keep/objects/f1/1c72f0484c803d954446036bf464c3b8523330 Normal file
View File

Binary file not shown.

1
test/integration/pullAndSetUpstream/expected/repo/.git_keep/refs/heads/master Normal file
View File

@ -0,0 +1 @@
dffd8a2962e840dfcbce39a0315e0cded7873b29

1
test/integration/pullAndSetUpstream/expected/repo/.git_keep/refs/remotes/origin/master Normal file
View File

@ -0,0 +1 @@
dffd8a2962e840dfcbce39a0315e0cded7873b29

0
test/integration/pullAndSetUpstream/expected/myfile1 → test/integration/pullAndSetUpstream/expected/repo/myfile1
View File

0
test/integration/pullAndSetUpstream/expected/myfile2 → test/integration/pullAndSetUpstream/expected/repo/myfile2
View File

0
test/integration/pullAndSetUpstream/expected/myfile3 → test/integration/pullAndSetUpstream/expected/repo/myfile3
View File

0
test/integration/pullAndSetUpstream/expected/myfile4 → test/integration/pullAndSetUpstream/expected/repo/myfile4
View File

BIN
test/integration/pullAndSetUpstream/expected_remote/objects/06/d3929607b7519beb45ca67165a1f2b5c0e578b
View File

Binary file not shown.

BIN
test/integration/pullAndSetUpstream/expected_remote/objects/76/6e681a51daa75233c1c4ae8845be2c893577d5
View File

Binary file not shown.

BIN
test/integration/pullAndSetUpstream/expected_remote/objects/97/2fb9caab8b8536ae38687fec98304b76748b9d
View File

Binary file not shown.

BIN
test/integration/pullAndSetUpstream/expected_remote/objects/c9/fd61f40de25556977e063683d1de612f931ccb
View File

Binary file not shown.

2
test/integration/pullAndSetUpstream/expected_remote/packed-refs
View File

@ -1,2 +0,0 @@
# pack-refs with: peeled fully-peeled sorted
766e681a51daa75233c1c4ae8845be2c893577d5 refs/heads/master

6
test/integration/pullAndSetUpstream/setup.sh
View File

@ -25,11 +25,11 @@ git add .
git commit -am "myfile4"
cd ..
git clone --bare ./actual actual_remote
git clone --bare ./repo origin
cd actual
cd repo
# the test is to ensure that we actually can pull these two commits back from the origin
git reset --hard HEAD~2
git remote add origin ../actual_remote
git remote add origin ../origin
git fetch origin