Merge pull request #462 from maxice8/uniform

style: formalize message telling issue/mr was closed/reopened
profclems · Dec 31, 2020 · e9d75bb · e9d75bb
2 parents 57fb2e5 + fbba8b3
commit e9d75bb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/commands/issue/close/issue_close.go b/commands/issue/close/issue_close.go
@@ -43,7 +43,7 @@ func NewCmdClose(f *cmdutils.Factory) *cobra.Command {
 				if err != nil {
 					return err
 				}
-				fmt.Fprintln(f.IO.StdOut, utils.GreenCheck()+" Issue #"+i2+" closed\n")
+				fmt.Fprintf(f.IO.StdOut, "%s Closed Issue #%s\n", utils.RedCheck(), i2)
 				fmt.Fprintln(f.IO.StdOut, issueutils.DisplayIssue(issue))
 			}
 			return nil

diff --git a/commands/issue/close/issue_close_test.go b/commands/issue/close/issue_close_test.go
@@ -48,7 +48,7 @@ func Test_issueClose(t *testing.T) {
 		{
 			Name:        "Issue Exists",
 			Issue:       "1",
-			ExpectedMsg: []string{"Closing Issue...", "Issue #1 closed"},
+			ExpectedMsg: []string{"Closing Issue...", "Closed Issue #1"},
 		},
 		{
 			Name:        "Issue Does Not Exist",

diff --git a/commands/issue/reopen/issue_reopen.go b/commands/issue/reopen/issue_reopen.go
@@ -50,7 +50,7 @@ func NewCmdReopen(f *cmdutils.Factory) *cobra.Command {
 					return err
 				}
 
-				fmt.Fprintln(out, utils.GreenCheck(), "Issue #"+i2+" reopened")
+				fmt.Fprintf(out, "%s Reopened Issue #%s\n", utils.GreenCheck(), i2)
 				fmt.Fprintln(out, issueutils.DisplayIssue(issue))
 			}
 			return nil

diff --git a/commands/mr/close/mr_close.go b/commands/mr/close/mr_close.go
@@ -44,7 +44,7 @@ func NewCmdClose(f *cmdutils.Factory) *cobra.Command {
 				if err != nil {
 					return err
 				}
-				fmt.Fprintf(f.IO.StdOut, "%s Merge request !%d\n", utils.RedCheck(), mr.IID)
+				fmt.Fprintf(f.IO.StdOut, "%s Closed Merge request !%d\n", utils.RedCheck(), mr.IID)
 				fmt.Fprintln(f.IO.StdOut, mrutils.DisplayMR(mr))
 			}
 

diff --git a/commands/mr/reopen/mr_reopen.go b/commands/mr/reopen/mr_reopen.go
@@ -46,7 +46,7 @@ func NewCmdReopen(f *cmdutils.Factory) *cobra.Command {
 					return err
 				}
 
-				fmt.Fprintf(f.IO.StdOut, "%s Merge request !%d reopened\n", utils.GreenCheck(), mr.IID)
+				fmt.Fprintf(f.IO.StdOut, "%s Reopened Merge request !%d\n", utils.GreenCheck(), mr.IID)
 				fmt.Fprintln(f.IO.StdOut, mrutils.DisplayMR(mr))
 			}