summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-02-22 22:25:18 +1100
committerJesse Duffield <jessedduffield@gmail.com>2023-02-22 22:29:01 +1100
commit1034962c7edad578427d056b7421c9195c29a457 (patch)
treec901a2309df784d3cdbe4d337c8b03acf61e20d2
parenteabe7f462a1f950d05b66306c19a00855e3fa175 (diff)
migrate more tests
Diffstat
-rw-r--r--pkg/integration/components/actions.go14
-rw-r--r--pkg/integration/tests/branch/rebase.go10
-rw-r--r--pkg/integration/tests/branch/rebase_and_drop.go10
-rw-r--r--pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go10
-rw-r--r--pkg/integration/tests/file/discard_changes.go5
-rw-r--r--pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go22
-rw-r--r--pkg/integration/tests/sync/pull_merge.go53
-rw-r--r--pkg/integration/tests/sync/pull_merge_conflict.go84
-rw-r--r--pkg/integration/tests/sync/pull_rebase.go52
-rw-r--r--pkg/integration/tests/sync/pull_rebase_conflict.go83
-rw-r--r--pkg/integration/tests/sync/pull_rebase_interactive_conflict.go95
-rw-r--r--pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go101
-rw-r--r--pkg/integration/tests/tests_gen.go6
-rw-r--r--test/integration/pullMerge/expected/origin/HEAD1
-rw-r--r--test/integration/pullMerge/expected/origin/config8
-rw-r--r--test/integration/pullMerge/expected/origin/description1
-rw-r--r--test/integration/pullMerge/expected/origin/info/exclude7
-rw-r--r--test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6ebin149 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin52 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad2
-rw-r--r--test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d2
-rw-r--r--test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin103 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591bin128 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9bin150 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin77 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/origin/packed-refs2
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG1
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD1
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/config18
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/description1
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/indexbin353 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/logs/HEAD7
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master7
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master1
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6ebin149 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin52 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad2
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d2
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin103 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591bin128 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606eabin149 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9bin150 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5bin200 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin77 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68bin103 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master1
-rw-r--r--test/integration/pullMerge/expected/repo/myfile11
-rw-r--r--test/integration/pullMerge/expected/repo/myfile21
-rw-r--r--test/integration/pullMerge/expected/repo/myfile31
-rw-r--r--test/integration/pullMerge/expected/repo/myfile41
-rw-r--r--test/integration/pullMerge/recording.json1
-rw-r--r--test/integration/pullMerge/setup.sh42
-rw-r--r--test/integration/pullMerge/test.json1
-rw-r--r--test/integration/pullMergeConflict/expected/origin/HEAD1
-rw-r--r--test/integration/pullMergeConflict/expected/origin/config8
-rw-r--r--test/integration/pullMergeConflict/expected/origin/description1
-rw-r--r--test/integration/pullMergeConflict/expected/origin/info/exclude7
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin52 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c2
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin103 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591bin128 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78bin150 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/7c/201cb45dc62900f5f42281c1235219df5d03882
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin77 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/c7/180f424ee6b59241eecffedcfa4472a86d927dbin150 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/origin/packed-refs2
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG25
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/FETCH_HEAD1
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/HEAD1
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/config18
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/description1
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/indexbin425 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/info/exclude7
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD7
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master7
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master1
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin52 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c2
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bcebin103 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591bin128 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/4d/b288af7bc797a3819441c734a4c4e7e36352962
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/77/a75278eb08101403d727a8ecaad724f5d9dc78bin150 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7c/201cb45dc62900f5f42281c1235219df5d03882
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/7d/a51df5143674eeec01d1bafa23ab8b9e69e8c2bin86 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22aebin24 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416bin77 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746bin103 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c2/5833e74799f64c317fe3f112f934fcc57b71f9bin199 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/c7/180f424ee6b59241eecffedcfa4472a86d927dbin150 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54bin21 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/refs/heads/master1
-rw-r--r--test/integration/pullMergeConflict/expected/repo/.git_keep/refs/remotes/origin/master1
-rw-r--r--test/integration/pullMergeConflict/expected/repo/myfile11
-rw-r--r--test/integration/pullMergeConflict/expected/repo/myfile21
-rw-r--r--test/integration/pullMergeConflict/expected/repo/myfile31
-rw-r--r--test/integration/pullMergeConflict/expected/repo/myfile41
-rw-r--r--test/integration/pullMergeConflict/recording.json1
-rw-r--r--test/integration/pullMergeConflict/setup.sh42
-rw-r--r--test/integration/pullMergeConflict/test.json1
-rw-r--r--test/integration/pullRebase/expected/origin/HEAD1
-rw-r--r--test/integration/pullRebase/expected/origin/config8
-rw-r--r--test/integration/pullRebase/expected/origin/description1
-rw-r--r--test/integration/pullRebase/expected/origin/info/exclude7
-rw-r--r--test/integration/pullRebase/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52bin52 -> 0 bytes
-rw-r--r--test/integration/pullRebase/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827<