GitLabgitlab-org
cli
main
1//go:build !integration
3package rebase
5import (
6 "testing"
8 "github.com/stretchr/testify/assert"
9 "github.com/stretchr/testify/require"
10 "go.uber.org/mock/gomock"
12 gitlab "gitlab.com/gitlab-org/api/client-go/v3"
13 gitlabtesting "gitlab.com/gitlab-org/api/client-go/v3/testing"
15 "gitlab.com/gitlab-org/cli/internal/testing/cmdtest"
16)
18func TestMrRebase(t *testing.T) {
19 type testCase struct {
20 name string
21 cli string
22 expectedOut string
23 wantErr bool
24 wantStderr string
25 setupMock func(tc *gitlabtesting.TestClient)
26 }
28 testMR := &gitlab.MergeRequest{
29 BasicMergeRequest: gitlab.BasicMergeRequest{
30 ID: 123,
31 IID: 123,
32 ProjectID: 3,
33 Title: "test mr title",
34 Description: "test mr description",
35 State: "opened",
36 },
37 }
39 testCases := []testCase{
40 {
41 name: "when an MR is rebased using an MR id",
42 cli: "123",
43 expectedOut: "✓ Rebase successful!\n",
44 setupMock: func(tc *gitlabtesting.TestClient) {
45 tc.MockMergeRequests.EXPECT().
46 GetMergeRequest("OWNER/REPO", int64(123), gomock.Any()).
47 Return(testMR, nil, nil)
48 tc.MockMergeRequests.EXPECT().
49 RebaseMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
50 Return(nil, nil)
51 tc.MockMergeRequests.EXPECT().
52 GetMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
53 Return(&gitlab.MergeRequest{
54 BasicMergeRequest: gitlab.BasicMergeRequest{
55 ID: 123,
56 IID: 123,
57 },
58 RebaseInProgress: false,
59 MergeError: "",
60 }, nil, nil)
61 },
62 },
63 {
64 name: "when an MR is rebased with skip-ci flag",
65 cli: "123 --skip-ci",
66 expectedOut: "✓ Rebase successful!\n",
67 setupMock: func(tc *gitlabtesting.TestClient) {
68 tc.MockMergeRequests.EXPECT().
69 GetMergeRequest("OWNER/REPO", int64(123), gomock.Any()).
70 Return(testMR, nil, nil)
71 tc.MockMergeRequests.EXPECT().
72 RebaseMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
73 Return(nil, nil)
74 tc.MockMergeRequests.EXPECT().
75 GetMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
76 Return(&gitlab.MergeRequest{
77 BasicMergeRequest: gitlab.BasicMergeRequest{
78 ID: 123,
79 IID: 123,
80 },
81 RebaseInProgress: false,
82 MergeError: "",
83 }, nil, nil)
84 },
85 },
86 {
87 name: "when an MR is rebased using current branch",
88 cli: "",
89 expectedOut: "✓ Rebase successful!\n",
90 setupMock: func(tc *gitlabtesting.TestClient) {
91 tc.MockMergeRequests.EXPECT().
92 ListProjectMergeRequests("OWNER/REPO", gomock.Any()).
93 Return([]*gitlab.BasicMergeRequest{{
94 ID: 123,
95 IID: 123,
96 ProjectID: 3,
97 Title: "test mr title",
98 Description: "test mr description",
99 State: "opened",
100 }}, nil, nil)
101 tc.MockMergeRequests.EXPECT().
102 GetMergeRequest("OWNER/REPO", int64(123), gomock.Any()).
103 Return(testMR, nil, nil)
104 tc.MockMergeRequests.EXPECT().
105 RebaseMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
106 Return(nil, nil)
107 tc.MockMergeRequests.EXPECT().
108 GetMergeRequest("OWNER/REPO", int64(123), gomock.Any(), gomock.Any()).
109 Return(&gitlab.MergeRequest{
110 BasicMergeRequest: gitlab.BasicMergeRequest{
111 ID: 123,
112 IID: 123,
113 },
114 RebaseInProgress: false,
115 MergeError: "",
116 }, nil, nil)
117 },
118 },
119 }
121 for _, tc := range testCases {
122 t.Run(tc.name, func(t *testing.T) {
123 // GIVEN
124 testClient := gitlabtesting.NewTestClient(t)
125 tc.setupMock(testClient)
126 exec := cmdtest.SetupCmdForTest(
127 t,
128 NewCmdRebase,
129 false,
130 cmdtest.WithGitLabClient(testClient.Client),
131 cmdtest.WithBranch("current-branch"),
132 )
134 // WHEN
135 out, err := exec(tc.cli)
137 // THEN
138 if tc.wantErr {
139 require.Error(t, err)
140 assert.Contains(t, err.Error(), tc.wantStderr)
141 return
142 }
143 require.NoError(t, err)
144 assert.Equal(t, tc.expectedOut, out.OutBuf.String())
145 assert.Empty(t, out.ErrBuf.String())
146 })
147 }
148}
Diagnostics8 git calls · 36 ms
CallStatusSizeTime036 ms
discover200185 B3 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=185 git.server.agent=git/2.56.g1891de4-Linux git.server.object_format=sha1 git.server.caps=agent ls-refs fetch server-option object-format git.server.fetch=shallow wait-for-done filter git.protocol.version=2 git.pkt.frames=9 git.pkt.data=7 git.pkt.flush=2 git.pkt.delim=0 git.pkt.bytes=185 git.pkt.payload.max=35
ls-refs20058 KiB · hit2 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=2 git.response.bytes=59849 git.response.cache=HIT git.response.duration_ms=2 git.protocol.version=2 git.pkt.frames=731 git.pkt.data=730 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=59849 git.pkt.payload.max=143 git.ls_refs.count=730 git.ls_refs.head=refs/heads/main
fetchtree:0 · deepen 1020032 KiB · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=4 git.response.bytes=32926 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=tree:0 git.fetch.wants=0dd7574dce9e385c5c30540e6c15657adc6bdce9 git.fetch.haves.count=0 git.fetch.deepen=10 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=22 git.pkt.data=20 git.pkt.flush=1 git.pkt.delim=1 git.pkt.bytes=32926 git.pkt.payload.max=32046 git.sideband.band1.bytes=32046 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=80 git.pack.bytes=32046 git.pack.ofs_delta=36 git.pack.ref_delta=0 git.pack.chain.max=2 git.pack.trailer=cb0bad5d7ffc514895d8b21c4dd470327f90bc91 git.pack.full=44Open pack map
fetchcombine:blob:none+tree:2 · deepen 12004.2 KiB · hit4 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=4273 git.response.cache=HIT git.response.duration_ms=4 git.fetch.filter=combine:blob:none+tree:2 git.fetch.wants=0dd7574dce9e385c5c30540e6c15657adc6bdce9 git.fetch.haves.count=0 git.fetch.deepen=1 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=7 git.pkt.data=5 git.pkt.flush=1 git.pkt.delim=1 git.pkt.bytes=4273 git.pkt.payload.max=4173 git.sideband.band1.bytes=4173 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=11 git.pack.bytes=4173 git.fetch.wide.objects=11 git.fetch.wide.extra_bytes=3930 git.fetch.wide.blobs=0
fetchtree:02001.8 KiB · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=1857 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=tree:0 git.fetch.wants=dce174ff8c632a19d17eea99c8a9b7c37fb2b592 git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=1857 git.pkt.payload.max=1830 git.sideband.band1.bytes=1830 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=1830 git.pack.trailer=fb03183b7909876778f740d196d7516811003517Open pack map
fetchtree:0200746 B · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=746 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=tree:0 git.fetch.wants=f3d413a22af5a9c2fe9aa49709b1cb36d1351a7f git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=746 git.pkt.payload.max=719 git.sideband.band1.bytes=719 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=719 git.pack.trailer=330baf80c59a4208b55120dff7dd824b7952b790Open pack map
fetchtree:0200140 B · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=23 git.response.bytes=140 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=tree:0 git.fetch.wants=1ca481d63b8250573e57dbb2e16ae9cedeb6d76b git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=140 git.pkt.payload.max=113 git.sideband.band1.bytes=113 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=113 git.pack.trailer=5d57ff6bc7eb49b33d62c094ec0f1ae502ed60acOpen pack map
fetch2001.0 KiB · hit23 ms
git.upload-pack fetch http.response.status_code=200 git.response.bytes=1047 git.response.cache=HIT git.response.duration_ms=23 git.fetch.wants=f35df68ff561fc3dd38d2d8e471e41a183054a9b git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=1047 git.pkt.payload.max=1020 git.sideband.band1.bytes=1020 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0
Each row is one HTTP round trip ply made to the git server for this page, on one timeline. discover asks what the server speaks, ls-refs lists branch tips, fetch brings objects by id. A hit was served by Workers Cache. Tap a row for its wire details.
- Remote
- https://gitlab.com/gitlab-org/cli
- Ref
- refs/heads/main
- Commit
- 0dd7574dce9e385c5c30540e6c15657adc6bdce9
- cf-ray
- a5eafff39c45d287
- Request
- 80f890d1…
- Protocol
- v2 · sha1
- Agent
- git/2.56.g1891de4-Linux
- Filter
- advertised
- Fetch
- shallow wait-for-done filter
- Capabilities
- agent ls-refs fetch server-option object-format