GitLabgitlab-org
cli
main
1//go:build !integration
3package update
5import (
6 "os"
7 "path/filepath"
8 "testing"
10 "github.com/stretchr/testify/assert"
11 "github.com/stretchr/testify/require"
12 "go.uber.org/mock/gomock"
14 gitlab "gitlab.com/gitlab-org/api/client-go/v3"
15 gitlabtesting "gitlab.com/gitlab-org/api/client-go/v3/testing"
17 "gitlab.com/gitlab-org/cli/internal/api"
18 "gitlab.com/gitlab-org/cli/internal/glinstance"
19 "gitlab.com/gitlab-org/cli/internal/testing/cmdtest"
20)
22func writeAttachFixture(t *testing.T, name string) string {
23 t.Helper()
25 path := filepath.Join(t.TempDir(), name)
26 require.NoError(t, os.WriteFile(path, []byte("\x89PNG\r\n\x1a\nfake png body"), 0o600))
27 return path
28}
30// stubMRAPI returns an accessor for the description that reached the update.
31func stubMRAPI(t *testing.T, existingDescription string) func() *string {
32 t.Helper()
34 oldUpdateMR, oldGetMR := api.UpdateMR, api.GetMR
35 t.Cleanup(func() { api.UpdateMR, api.GetMR = oldUpdateMR, oldGetMR })
37 api.GetMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.GetMergeRequestsOptions) (*gitlab.MergeRequest, error) {
38 return &gitlab.MergeRequest{BasicMergeRequest: gitlab.BasicMergeRequest{
39 ID: mrID, IID: mrID, Title: "mrTitle", State: "opened", Description: existingDescription,
40 }}, nil
41 }
43 var gotDescription *string
44 api.UpdateMR = func(client *gitlab.Client, projectID any, mrID int64, opts *gitlab.UpdateMergeRequestOptions) (*gitlab.MergeRequest, error) {
45 gotDescription = opts.Description
46 return &gitlab.MergeRequest{BasicMergeRequest: gitlab.BasicMergeRequest{ID: mrID, IID: mrID, Title: "mrTitle", State: "opened"}}, nil
47 }
49 return func() *string { return gotDescription }
50}
52func TestUpdateMergeRequest_AttachAppendsToTheExistingBody(t *testing.T) {
53 path := writeAttachFixture(t, "screenshot.png")
55 description := stubMRAPI(t, "Original body.")
57 tc := gitlabtesting.NewTestClient(t)
58 tc.MockProjectMarkdownUploads.EXPECT().
59 UploadProjectMarkdown("OWNER/REPO", gomock.Any(), "screenshot.png", gomock.Any()).
60 Return(&gitlab.ProjectMarkdownUploadedFile{Markdown: ""}, nil, nil)
62 exec := cmdtest.SetupCmdForTest(t, NewCmdUpdate, false,
63 cmdtest.WithGitLabClient(tc.Client),
64 cmdtest.WithBaseRepo("OWNER", "REPO", glinstance.DefaultHostname),
65 )
67 _, err := exec(`1 --attach ` + path)
68 require.NoError(t, err)
70 require.NotNil(t, description())
71 assert.Equal(t, "Original body.\n\n", *description())
72}
74func TestUpdateMergeRequest_AttachWithDescriptionReplacesTheBody(t *testing.T) {
75 path := writeAttachFixture(t, "screenshot.png")
77 description := stubMRAPI(t, "Original body.")
79 tc := gitlabtesting.NewTestClient(t)
80 tc.MockProjectMarkdownUploads.EXPECT().
81 UploadProjectMarkdown("OWNER/REPO", gomock.Any(), "screenshot.png", gomock.Any()).
82 Return(&gitlab.ProjectMarkdownUploadedFile{Markdown: ""}, nil, nil)
84 exec := cmdtest.SetupCmdForTest(t, NewCmdUpdate, false,
85 cmdtest.WithGitLabClient(tc.Client),
86 cmdtest.WithBaseRepo("OWNER", "REPO", glinstance.DefaultHostname),
87 )
89 _, err := exec(`1 --description "Replaced body." --attach ` + path)
90 require.NoError(t, err)
92 require.NotNil(t, description())
93 assert.Equal(t, "Replaced body.\n\n", *description())
94}
96func TestUpdateMergeRequest_NoAttachLeavesTheBodyAlone(t *testing.T) {
97 description := stubMRAPI(t, "Original body.")
99 exec := cmdtest.SetupCmdForTest(t, NewCmdUpdate, false,
100 cmdtest.WithBaseRepo("OWNER", "REPO", glinstance.DefaultHostname),
101 )
103 _, err := exec(`1 --description "Replaced body."`)
104 require.NoError(t, err)
106 require.NotNil(t, description())
107 assert.Equal(t, "Replaced body.", *description())
108}
Diagnostics8 git calls · 246 ms
CallStatusSizeTime0246 ms
discover200185 B3 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 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 · hit10 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 git.response.bytes=59849 git.response.cache=HIT git.response.duration_ms=10 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
fetchcombine:blob:none+tree:2 · deepen 12004.2 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=4273 git.response.cache=HIT git.response.duration_ms=2 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: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=2 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
fetchtree:02001.8 KiB · hit1 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=1 git.response.bytes=1857 git.response.cache=HIT git.response.duration_ms=1 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 · hit3 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=3 git.response.bytes=746 git.response.cache=HIT git.response.duration_ms=3 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:0200202 B · hit3 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=3 git.response.bytes=202 git.response.cache=HIT git.response.duration_ms=3 git.fetch.filter=tree:0 git.fetch.wants=fa6643fe030fa248faec6c90791640385205057a 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=202 git.pkt.payload.max=175 git.sideband.band1.bytes=175 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=175 git.pack.trailer=5de59e2c2970b3a7ffbcd12e501883f267881024Open pack map
fetch2001.1 KiB227 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=227 git.response.bytes=1129 git.response.cache=MISS git.response.duration_ms=227 git.fetch.wants=7bd161bfcfe7d6413431a05ec20dfaac25ca2e2f 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=1129 git.pkt.payload.max=1102 git.sideband.band1.bytes=1102 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
- a5e2d19c2dcecf3a
- Request
- 350f02fd…
- 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