//go:build !integration package note import ( "bytes" "errors" "net/http" "testing" "git.sr.ht/~timofurrer/ugh" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" gitlab "gitlab.com/gitlab-org/api/client-go/v3" gitlabtesting "gitlab.com/gitlab-org/api/client-go/v3/testing" "gitlab.com/gitlab-org/cli/internal/cmdutils" "gitlab.com/gitlab-org/cli/internal/config" "gitlab.com/gitlab-org/cli/internal/testing/cmdtest" ) func Test_NewCmdCreate(t *testing.T) { t.Parallel() t.Run("help explains how to find discussion IDs", func(t *testing.T) { t.Parallel() var output bytes.Buffer cmd := NewCmdCreate(cmdtest.NewTestFactory(nil)) cmd.SetArgs([]string{"--help"}) cmd.SetOut(&output) require.NoError(t, cmd.Execute()) out := output.String() assert.Contains(t, out, "glab mr note list") assert.Contains(t, out, "glab mr note list -F json | jq -r '.[].id'") assert.Contains(t, out, "the `id` field of each discussion object") assert.Contains(t, out, "eight characters before the ellipsis") assert.Contains(t, out, "[discussion: abc12345…]") assert.Contains(t, out, "--reply abc12345") assert.NotContains(t, out, "--reply abc12345…") assert.NotContains(t, out, "top-level `.id`") }) t.Run("--message flag specified", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { assert.Equal(t, "Here is my note", *opts.Body) return &gitlab.Discussion{ ID: "disc1", Notes: []*gitlab.Note{ {ID: 301, NoteableID: 1, NoteableType: "MergeRequest", NoteableIID: 1}, }, }, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --message "Here is my note"`) require.NoError(t, err) assert.Empty(t, output.Stderr()) assert.Equal(t, "https://gitlab.com/OWNER/REPO/merge_requests/1#note_301\n", output.String()) }) t.Run("merge request not found", func(t *testing.T) { t.Parallel() testClient := setupMRNotFound(t) exec := setupCreateExec(t, testClient) _, err := exec(`122`) require.Error(t, err) assert.Contains(t, err.Error(), "Not Found") }) } func Test_NewCmdCreate_error(t *testing.T) { t.Parallel() t.Run("note could not be created", func(t *testing.T) { t.Parallel() testClient := setupMR(t) unauthorizedResp := &gitlab.Response{ Response: &http.Response{StatusCode: http.StatusUnauthorized}, } testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return(nil, unauthorizedResp, errors.New("401 Unauthorized")) exec := setupCreateExec(t, testClient) _, err := exec(`1 -m "Some message"`) require.Error(t, err) }) } func Test_cmdCreate_repoOverride(t *testing.T) { t.Parallel() t.Run("--message flag specified", func(t *testing.T) { t.Parallel() testClient := gitlabtesting.NewTestClient(t) mockMR1InRepo(t, testClient, "gitlab-org/cli") testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("gitlab-org/cli", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { assert.Equal(t, "Here is my note", *opts.Body) return &gitlab.Discussion{ ID: "disc-override-message", Notes: []*gitlab.Note{ {ID: 801, NoteableID: 1, NoteableType: "MergeRequest", NoteableIID: 1}, }, }, nil, nil }) exec := setupCreateExecWithRepoOverride(t, testClient, true) output, err := exec(`1 -R gitlab-org/cli --message "Here is my note"`) require.NoError(t, err) assert.Empty(t, output.Stderr()) assert.Equal(t, "https://gitlab.com/gitlab-org/cli/merge_requests/1#note_801\n", output.String()) }) t.Run("reads body from stdin with repo override", func(t *testing.T) { t.Parallel() testClient := gitlabtesting.NewTestClient(t) mockMR1InRepo(t, testClient, "gitlab-org/cli") testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("gitlab-org/cli", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { assert.Equal(t, "Message from stdin", *opts.Body) return &gitlab.Discussion{ ID: "disc-override-stdin", Notes: []*gitlab.Note{ {ID: 802, NoteableID: 1, NoteableType: "MergeRequest", NoteableIID: 1}, }, }, nil, nil }) exec := setupCreateExecWithRepoOverride(t, testClient, false, cmdtest.WithStdin("Message from stdin\n")) output, err := exec(`1 -R gitlab-org/cli`) require.NoError(t, err) assert.Empty(t, output.Stderr()) assert.Equal(t, "https://gitlab.com/gitlab-org/cli/merge_requests/1#note_802\n", output.String()) }) } func Test_cmdCreate_prompt(t *testing.T) { // NOTE: This test cannot run in parallel because the huh form library // uses global state (charmbracelet/bubbles runeutil sanitizer). t.Run("message provided via prompt", func(t *testing.T) { testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { assert.Contains(t, *opts.Body, "some note message") return &gitlab.Discussion{ ID: "disc1", Notes: []*gitlab.Note{ {ID: 301, NoteableID: 1, NoteableType: "MergeRequest", NoteableIID: 1}, }, }, nil, nil }) c := ugh.New(t) c.Expect(ugh.Input("Note message:")). Do(ugh.Type("some note message")) exec := cmdtest.SetupCmdForTest(t, NewCmdCreate, true, cmdtest.WithGitLabClient(testClient.Client), cmdtest.WithBaseRepo("OWNER", "REPO", ""), cmdtest.WithConfig(config.NewFromString("editor: vi")), cmdtest.WithConsole(t, c), ) output, err := exec(`1`) require.NoError(t, err) assert.Empty(t, output.Stderr()) assert.Contains(t, output.String(), "https://gitlab.com/OWNER/REPO/merge_requests/1#note_301") }) t.Run("message is empty", func(t *testing.T) { testClient := setupMR(t) c := ugh.New(t) c.Expect(ugh.Input("Note message:")). Do(ugh.Type("")) exec := cmdtest.SetupCmdForTest(t, NewCmdCreate, true, cmdtest.WithGitLabClient(testClient.Client), cmdtest.WithBaseRepo("OWNER", "REPO", ""), cmdtest.WithConfig(config.NewFromString("editor: vi")), cmdtest.WithConsole(t, c), ) _, err := exec(`1`) require.Error(t, err) assert.Equal(t, "aborted: note has an empty message", err.Error()) }) } func Test_cmdCreate_unique_prompt(t *testing.T) { // NOTE: This test cannot run in parallel because the huh form library // uses global state (charmbracelet/bubbles runeutil sanitizer). t.Run("duplicate found", func(t *testing.T) { testClient := setupMR(t) testClient.MockNotes.EXPECT(). ListMergeRequestNotes("OWNER/REPO", int64(1), gomock.Any()). Return([]*gitlab.Note{ {ID: 0, Body: "aaa"}, {ID: 111, Body: "bbb"}, {ID: 222, Body: "some note message"}, {ID: 333, Body: "ccc"}, }, nil, nil) c := ugh.New(t) c.Expect(ugh.Input("Note message:")). Do(ugh.Type("some note message")) exec := cmdtest.SetupCmdForTest(t, NewCmdCreate, true, cmdtest.WithGitLabClient(testClient.Client), cmdtest.WithBaseRepo("OWNER", "REPO", ""), cmdtest.WithConfig(config.NewFromString("editor: vi")), cmdtest.WithConsole(t, c), ) output, err := exec(`1 --unique`) require.NoError(t, err) assert.Empty(t, output.Stderr()) assert.Contains(t, output.String(), "https://gitlab.com/OWNER/REPO/merge_requests/1#note_222") }) } func Test_cmdCreate_unique(t *testing.T) { t.Parallel() t.Run("no duplicate creates new note", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockNotes.EXPECT(). ListMergeRequestNotes("OWNER/REPO", int64(1), gomock.Any()). Return([]*gitlab.Note{ {ID: 100, Body: "other note"}, }, nil, nil) testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { assert.Equal(t, "brand new note", *opts.Body) return &gitlab.Discussion{ ID: "disc1", Notes: []*gitlab.Note{ {ID: 301, NoteableID: 1, NoteableType: "MergeRequest", NoteableIID: 1}, }, }, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 -m "brand new note" --unique`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_301") }) } func Test_cmdCreate_reply(t *testing.T) { t.Parallel() const fullID = "abc12345deadbeef1234567890abcdef12345678" t.Run("replies to discussion by full ID", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{{ID: fullID}}, nil, nil) testClient.MockDiscussions.EXPECT(). AddMergeRequestDiscussionNote("OWNER/REPO", int64(1), fullID, gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, discID string, opts *gitlab.AddMergeRequestDiscussionNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) { assert.Equal(t, "I agree!", *opts.Body) return &gitlab.Note{ID: 901}, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --reply ` + fullID + ` -m "I agree!"`) require.NoError(t, err) assert.Equal(t, "https://gitlab.com/OWNER/REPO/merge_requests/1#note_901\n", output.String()) }) t.Run("replies to discussion by prefix", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{ {ID: fullID}, {ID: "ff000000deadbeef1234567890abcdef12345678"}, }, nil, nil) testClient.MockDiscussions.EXPECT(). AddMergeRequestDiscussionNote("OWNER/REPO", int64(1), fullID, gomock.Any(), gomock.Any()). Return(&gitlab.Note{ID: 902}, nil, nil) exec := setupCreateExec(t, testClient) output, err := exec(`1 --reply abc12345 -m "thanks"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_902") }) t.Run("prefix too short", func(t *testing.T) { t.Parallel() testClient := setupMR(t) exec := setupCreateExec(t, testClient) _, err := exec(`1 --reply abc -m "hi"`) require.Error(t, err) assert.Contains(t, err.Error(), "at least 8 characters") }) t.Run("prefix not found", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{{ID: "ff000000deadbeef1234567890abcdef12345678"}}, nil, nil) exec := setupCreateExec(t, testClient) _, err := exec(`1 --reply abc12345 -m "hi"`) require.Error(t, err) assert.Contains(t, err.Error(), "no discussion found") }) t.Run("ambiguous prefix", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{ {ID: "abc123450000beef1234567890abcdef12345678"}, {ID: "abc123459999beef1234567890abcdef12345678"}, }, nil, nil) exec := setupCreateExec(t, testClient) _, err := exec(`1 --reply abc12345 -m "hi"`) require.Error(t, err) assert.Contains(t, err.Error(), "matches 2 discussions") }) t.Run("AddMergeRequestDiscussionNote error wrapped", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{{ID: fullID}}, nil, nil) testClient.MockDiscussions.EXPECT(). AddMergeRequestDiscussionNote("OWNER/REPO", int64(1), fullID, gomock.Any(), gomock.Any()). Return(nil, nil, errors.New("boom")) exec := setupCreateExec(t, testClient) _, err := exec(`1 --reply ` + fullID + ` -m "hi"`) require.Error(t, err) assert.Contains(t, err.Error(), "failed to add reply") assert.Contains(t, err.Error(), "boom") }) t.Run("--reply and --unique are mutually exclusive", func(t *testing.T) { t.Parallel() testClient := gitlabtesting.NewTestClient(t) exec := setupCreateExec(t, testClient) _, err := exec(`1 --reply abc12345 --unique -m "hi"`) require.Error(t, err) assert.Contains(t, err.Error(), "none of the others can be") }) } func Test_cmdCreate_resolvable(t *testing.T) { t.Parallel() t.Run("default (no flag) posts a resolvable discussion via the Discussions API", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { assert.Equal(t, "default path", *opts.Body) return &gitlab.Discussion{ ID: "disc-default", Notes: []*gitlab.Note{{ID: 500}}, }, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 -m "default path"`) require.NoError(t, err) assert.Equal(t, "https://gitlab.com/OWNER/REPO/merge_requests/1#note_500\n", output.String()) }) t.Run("--resolvable=false posts a plain note via the Notes API", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockNotes.EXPECT(). CreateMergeRequestNote("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) { assert.Equal(t, "Build status: green", *opts.Body) assert.Nil(t, opts.Internal) return &gitlab.Note{ID: 501}, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --resolvable=false -m "Build status: green"`) require.NoError(t, err) assert.Empty(t, output.Stderr()) assert.Equal(t, "https://gitlab.com/OWNER/REPO/merge_requests/1#note_501\n", output.String()) }) t.Run("--resolvable=false --unique skips duplicate then posts a note", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockNotes.EXPECT(). ListMergeRequestNotes("OWNER/REPO", int64(1), gomock.Any()). Return([]*gitlab.Note{ {ID: 100, Body: "other note"}, }, nil, nil) testClient.MockNotes.EXPECT(). CreateMergeRequestNote("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) { assert.Equal(t, "brand new note", *opts.Body) return &gitlab.Note{ID: 502}, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --resolvable=false --unique -m "brand new note"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_502") }) t.Run("--resolvable=false and --reply are mutually exclusive", func(t *testing.T) { t.Parallel() testClient := gitlabtesting.NewTestClient(t) exec := setupCreateExec(t, testClient) _, err := exec(`1 --resolvable=false --reply abc12345 -m "hi"`) require.Error(t, err) assert.Contains(t, err.Error(), "--resolvable=false cannot be used with --reply") }) t.Run("--resolvable=false and --file are mutually exclusive", func(t *testing.T) { t.Parallel() testClient := gitlabtesting.NewTestClient(t) exec := setupCreateExec(t, testClient) _, err := exec(`1 --resolvable=false --file main.go -m "hi"`) require.Error(t, err) assert.Contains(t, err.Error(), "--resolvable=false cannot be used with --file, --line, or --old-line") }) t.Run("--resolvable=true with --reply is allowed (no false positive)", func(t *testing.T) { t.Parallel() const fullID = "abc12345deadbeef1234567890abcdef12345678" testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{{ID: fullID}}, nil, nil) testClient.MockDiscussions.EXPECT(). AddMergeRequestDiscussionNote("OWNER/REPO", int64(1), fullID, gomock.Any(), gomock.Any()). Return(&gitlab.Note{ID: 503}, nil, nil) exec := setupCreateExec(t, testClient) output, err := exec(`1 --resolvable=true --reply abc12345 -m "hi"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_503") }) } func Test_cmdCreate_internal(t *testing.T) { t.Parallel() t.Run("--internal posts an internal note via the Notes API", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockNotes.EXPECT(). CreateMergeRequestNote("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) { assert.Equal(t, "Rotating the leaked token now.", *opts.Body) require.NotNil(t, opts.Internal) assert.True(t, *opts.Internal) return &gitlab.Note{ID: 600}, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --internal -m "Rotating the leaked token now."`) require.NoError(t, err) assert.Empty(t, output.Stderr()) assert.Equal(t, "https://gitlab.com/OWNER/REPO/merge_requests/1#note_600\n", output.String()) }) t.Run("--internal with an explicit --resolvable=false posts an internal note", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockNotes.EXPECT(). CreateMergeRequestNote("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) { require.NotNil(t, opts.Internal) assert.True(t, *opts.Internal) return &gitlab.Note{ID: 601}, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --internal --resolvable=false -m "members only"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_601") }) t.Run("--internal --unique posts when no matching note exists", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockNotes.EXPECT(). ListMergeRequestNotes("OWNER/REPO", int64(1), gomock.Any()). Return([]*gitlab.Note{{ID: 100, Body: "other note"}}, nil, nil) testClient.MockNotes.EXPECT(). CreateMergeRequestNote("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) { require.NotNil(t, opts.Internal) assert.True(t, *opts.Internal) return &gitlab.Note{ID: 602}, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --internal --unique -m "brand new internal note"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_602") }) t.Run("--internal never falls back to the Discussions API", func(t *testing.T) { t.Parallel() testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Times(0) testClient.MockNotes.EXPECT(). CreateMergeRequestNote("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return(&gitlab.Note{ID: 603}, nil, nil) exec := setupCreateExec(t, testClient) _, err := exec(`1 --internal -m "members only"`) require.NoError(t, err) }) t.Run("--internal and --resolvable=true are mutually exclusive", func(t *testing.T) { t.Parallel() testClient := gitlabtesting.NewTestClient(t) exec := setupCreateExec(t, testClient) _, err := exec(`1 --internal --resolvable=true -m "hi"`) require.Error(t, err) assert.Contains(t, err.Error(), "--internal cannot be used with --resolvable=true") }) t.Run("--internal --reply posts to an internal thread, which makes the reply internal", func(t *testing.T) { t.Parallel() const fullID = "abc12345deadbeef1234567890abcdef12345678" testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{ {ID: fullID, Notes: []*gitlab.Note{{ID: 1, Internal: true}}}, }, nil, nil) testClient.MockDiscussions.EXPECT(). AddMergeRequestDiscussionNote("OWNER/REPO", int64(1), fullID, gomock.Any(), gomock.Any()). Return(&gitlab.Note{ID: 604}, nil, nil) exec := setupCreateExec(t, testClient) output, err := exec(`1 --reply abc12345 --internal -m "Patch is ready."`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_604") }) t.Run("--internal --reply refuses to post to a public thread", func(t *testing.T) { t.Parallel() const fullID = "abc12345deadbeef1234567890abcdef12345678" testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{ {ID: fullID, Notes: []*gitlab.Note{{ID: 1, Internal: false}}}, }, nil, nil) testClient.MockDiscussions.EXPECT(). AddMergeRequestDiscussionNote(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Times(0) exec := setupCreateExec(t, testClient) _, err := exec(`1 --reply abc12345 --internal -m "Patch is ready."`) require.Error(t, err) assert.Contains(t, err.Error(), "is not internal") assert.Contains(t, err.Error(), "would be publicly visible") }) t.Run("--reply without --internal still posts to an internal thread", func(t *testing.T) { t.Parallel() const fullID = "abc12345deadbeef1234567890abcdef12345678" testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{ {ID: fullID, Notes: []*gitlab.Note{{ID: 1, Internal: true}}}, }, nil, nil) testClient.MockDiscussions.EXPECT(). AddMergeRequestDiscussionNote("OWNER/REPO", int64(1), fullID, gomock.Any(), gomock.Any()). Return(&gitlab.Note{ID: 605}, nil, nil) exec := setupCreateExec(t, testClient) output, err := exec(`1 --reply abc12345 -m "no flag needed"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_605") }) t.Run("--internal and --file are mutually exclusive", func(t *testing.T) { t.Parallel() testClient := gitlabtesting.NewTestClient(t) exec := setupCreateExec(t, testClient) _, err := exec(`1 --internal --file main.go --line 42 -m "hi"`) require.Error(t, err) assert.Contains(t, err.Error(), "none of the others can be") }) } func Test_cmdCreate_reply_prompt(t *testing.T) { // NOTE: This test cannot run in parallel because the huh form library // uses global state (charmbracelet/bubbles runeutil sanitizer). const fullID = "abc12345deadbeef1234567890abcdef12345678" t.Run("message provided via prompt", func(t *testing.T) { testClient := setupMR(t) testClient.MockDiscussions.EXPECT(). ListMergeRequestDiscussions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.Discussion{{ID: fullID}}, nil, nil) testClient.MockDiscussions.EXPECT(). AddMergeRequestDiscussionNote("OWNER/REPO", int64(1), fullID, gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, discID string, opts *gitlab.AddMergeRequestDiscussionNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) { assert.Equal(t, "prompted reply", *opts.Body) return &gitlab.Note{ID: 950}, nil, nil }) c := ugh.New(t) c.Expect(ugh.Input("Note message:")). Do(ugh.Type("prompted reply")) exec := cmdtest.SetupCmdForTest(t, NewCmdCreate, true, cmdtest.WithGitLabClient(testClient.Client), cmdtest.WithBaseRepo("OWNER", "REPO", ""), cmdtest.WithConfig(config.NewFromString("editor: vi")), cmdtest.WithConsole(t, c), ) output, err := exec(`1 --reply ` + fullID) require.NoError(t, err) assert.Empty(t, output.Stderr()) assert.Contains(t, output.String(), "https://gitlab.com/OWNER/REPO/merge_requests/1#note_950") }) } func Test_cmdCreate_stdin(t *testing.T) { t.Parallel() tests := []struct { name string stdin string wantErr string expectedOut string }{ { name: "reads body from stdin when not a TTY", stdin: "Message from stdin\n", expectedOut: "https://gitlab.com/OWNER/REPO/merge_requests/1#note_700\n", }, { name: "empty stdin produces error", stdin: "", wantErr: "aborted: note has an empty message", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { t.Parallel() testClient := setupMR(t) if tt.wantErr == "" { testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { assert.Equal(t, "Message from stdin", *opts.Body) return &gitlab.Discussion{ ID: "disc-stdin", Notes: []*gitlab.Note{ {ID: 700, NoteableID: 1, NoteableType: "MergeRequest", NoteableIID: 1}, }, }, nil, nil }) } exec := cmdtest.SetupCmdForTest(t, NewCmdCreate, false, cmdtest.WithGitLabClient(testClient.Client), cmdtest.WithBaseRepo("OWNER", "REPO", ""), cmdtest.WithConfig(config.NewFromString("editor: vi")), cmdtest.WithStdin(tt.stdin), ) output, err := exec(`1`) if tt.wantErr != "" { require.Error(t, err) assert.Equal(t, tt.wantErr, err.Error()) return } require.NoError(t, err) assert.Equal(t, tt.expectedOut, output.String()) }) } } func Test_cmdCreate_diffComment(t *testing.T) { t.Parallel() t.Run("diff comment on new-side line", func(t *testing.T) { t.Parallel() testClient := setupMR(t) makeDiffVersion(t, testClient) testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { assert.Equal(t, "Comment on new line", *opts.Body) require.NotNil(t, opts.Position) assert.Equal(t, int64(2), *opts.Position.NewLine) return &gitlab.Discussion{ ID: "disc-diff-1", Notes: []*gitlab.Note{ {ID: 500}, }, }, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --file main.go --line 2 -m "Comment on new line"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_500") }) t.Run("diff comment on old-side line", func(t *testing.T) { t.Parallel() testClient := setupMR(t) makeDiffVersion(t, testClient) testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { require.NotNil(t, opts.Position) assert.Equal(t, int64(2), *opts.Position.OldLine) return &gitlab.Discussion{ ID: "disc-diff-2", Notes: []*gitlab.Note{ {ID: 501}, }, }, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --file main.go --old-line 2 -m "Comment on removed line"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_501") }) t.Run("diff comment with multiline range", func(t *testing.T) { t.Parallel() testClient := setupMR(t) makeDiffVersion(t, testClient) testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { require.NotNil(t, opts.Position) require.NotNil(t, opts.Position.LineRange) assert.NotNil(t, opts.Position.LineRange.Start) assert.NotNil(t, opts.Position.LineRange.End) return &gitlab.Discussion{ ID: "disc-diff-3", Notes: []*gitlab.Note{ {ID: 502}, }, }, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --file main.go --line 2:3 -m "Range comment"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_502") }) t.Run("file-level diff comment (no line)", func(t *testing.T) { t.Parallel() testClient := setupMR(t) makeDiffVersion(t, testClient) testClient.MockDiscussions.EXPECT(). CreateMergeRequestDiscussion("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). DoAndReturn(func(pid any, mrIID int64, opts *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) { require.NotNil(t, opts.Position) assert.Equal(t, "text", *opts.Position.PositionType) return &gitlab.Discussion{ ID: "disc-diff-4", Notes: []*gitlab.Note{ {ID: 503}, }, }, nil, nil }) exec := setupCreateExec(t, testClient) output, err := exec(`1 --file main.go -m "File-level comment"`) require.NoError(t, err) assert.Contains(t, output.String(), "#note_503") }) t.Run("file not found in diff", func(t *testing.T) { t.Parallel() testClient := setupMR(t) makeDiffVersion(t, testClient) exec := setupCreateExec(t, testClient) _, err := exec(`1 --file nonexistent.go --line 1 -m "bad file"`) require.Error(t, err) assert.Contains(t, err.Error(), "not found in MR diff") }) t.Run("invalid line format fails before any API call", func(t *testing.T) { t.Parallel() testClient := gitlabtesting.NewTestClient(t) exec := setupCreateExec(t, testClient) _, err := exec(`1 --file main.go --line abc -m "bad line"`) require.Error(t, err) assert.Contains(t, err.Error(), `invalid argument "abc" for "--line" flag: invalid line number "abc"`) }) t.Run("--line without --file", func(t *testing.T) { t.Parallel() testClient := setupMR(t) exec := setupCreateExec(t, testClient) _, err := exec(`1 --line 5 -m "test"`) require.Error(t, err) assert.Contains(t, err.Error(), "--line and --old-line require --file") }) t.Run("--old-line without --file", func(t *testing.T) { t.Parallel() testClient := setupMR(t) exec := setupCreateExec(t, testClient) _, err := exec(`1 --old-line 3 -m "test"`) require.Error(t, err) assert.Contains(t, err.Error(), "--line and --old-line require --file") }) } // --- test helpers --- func setupMR(t *testing.T) *gitlabtesting.TestClient { t.Helper() testClient := gitlabtesting.NewTestClient(t) mockMR1(t, testClient) return testClient } func makeDiffVersion(t *testing.T, testClient *gitlabtesting.TestClient) { t.Helper() diffContent := `@@ -1,5 +1,6 @@ line1 -old line2 +new line2 +added line3 line4 line5 ` testClient.MockMergeRequests.EXPECT(). GetMergeRequestDiffVersions("OWNER/REPO", int64(1), gomock.Any(), gomock.Any()). Return([]*gitlab.MergeRequestDiffVersion{ {ID: 10, BaseCommitSHA: "base", HeadCommitSHA: "head", StartCommitSHA: "start"}, }, nil, nil) testClient.MockMergeRequests.EXPECT(). GetSingleMergeRequestDiffVersion("OWNER/REPO", int64(1), int64(10), gomock.Any(), gomock.Any()). Return(&gitlab.MergeRequestDiffVersion{ ID: 10, BaseCommitSHA: "base", HeadCommitSHA: "head", StartCommitSHA: "start", Diffs: []*gitlab.Diff{ { NewPath: "main.go", OldPath: "main.go", Diff: diffContent, }, }, }, nil, nil) } func setupMRNotFound(t *testing.T) *gitlabtesting.TestClient { t.Helper() testClient := gitlabtesting.NewTestClient(t) notFoundResp := &gitlab.Response{ Response: &http.Response{StatusCode: http.StatusNotFound}, } testClient.MockMergeRequests.EXPECT(). GetMergeRequest("OWNER/REPO", int64(122), gomock.Any()). Return(nil, notFoundResp, gitlab.ErrNotFound) return testClient } func setupCreateExec(t *testing.T, testClient *gitlabtesting.TestClient) cmdtest.CmdExecFunc { t.Helper() return cmdtest.SetupCmdForTest(t, NewCmdCreate, true, cmdtest.WithGitLabClient(testClient.Client), cmdtest.WithBaseRepo("OWNER", "REPO", ""), cmdtest.WithConfig(config.NewFromString("editor: vi")), ) } func setupCreateExecWithRepoOverride(t *testing.T, testClient *gitlabtesting.TestClient, isTTY bool, opts ...cmdtest.FactoryOption) cmdtest.CmdExecFunc { t.Helper() factoryOpts := []cmdtest.FactoryOption{ cmdtest.WithGitLabClient(testClient.Client), cmdtest.WithBaseRepo("WRONG", "REPO", ""), cmdtest.WithConfig(config.NewFromString("editor: vi")), } factoryOpts = append(factoryOpts, opts...) return cmdtest.SetupCmdForTest(t, func(f cmdutils.Factory) *cobra.Command { cmd := NewCmdCreate(f) cmdutils.AddGlobalRepoOverride(cmd, f) return cmd }, isTTY, factoryOpts...) }