Merge pull request cli#227 from github/typoswap

tierninho · web-flow · commit 99c17c3a5feb · 2020-01-16T16:51:02.000-08:00
Typo fixes for Issue/PR preview text
diff --git a/command/issue.go b/command/issue.go
@@ -36,7 +36,7 @@ func init() {
 	issueListCmd.Flags().StringP("state", "s", "", "Filter by state: {open|closed|all}")
 	issueListCmd.Flags().IntP("limit", "L", 30, "Maximum number of issues to fetch")
 
-	issueViewCmd.Flags().BoolP("preview", "p", false, "Preview PR in terminal")
+	issueViewCmd.Flags().BoolP("preview", "p", false, "Display preview of issue content")
 }
 
 var issueCmd = &cobra.Command{
diff --git a/command/pr.go b/command/pr.go
@@ -32,7 +32,7 @@ func init() {
 	prListCmd.Flags().StringSliceP("label", "l", nil, "Filter by label")
 	prListCmd.Flags().StringP("assignee", "a", "", "Filter by assignee")
 
-	prViewCmd.Flags().BoolP("preview", "p", false, "Preview PR in terminal")
+	prViewCmd.Flags().BoolP("preview", "p", false, "Display preview of pull request content")
 }
 
 var prCmd = &cobra.Command{
@@ -318,7 +318,7 @@ func printPrPreview(out io.Writer, pr *api.PullRequest) {
 	fmt.Fprintln(out)
 	fmt.Fprintln(out, utils.RenderMarkdown(pr.Body))
 	fmt.Fprintln(out)
-	fmt.Fprintf(out, utils.Gray("View this PR on GitHub: %s\n"), pr.URL)
+	fmt.Fprintf(out, utils.Gray("View this pull request on GitHub: %s\n"), pr.URL)
 }
 
 var prURLRE = regexp.MustCompile(`^https://github\.com/([^/]+)/([^/]+)/pull/(\d+)`)
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -257,7 +257,7 @@ func TestPRView_preview(t *testing.T) {
 		regexp.MustCompile(`Blueberries are from a fork`),
 		regexp.MustCompile(`nobody wants to merge 12 commits into master from blueberries`),
 		regexp.MustCompile(`blueberries taste good`),
-		regexp.MustCompile(`View this PR on GitHub: https://github.com/OWNER/REPO/pull/12`),
+		regexp.MustCompile(`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/12`),
 	}
 	for _, r := range expectedLines {
 		if !r.MatchString(output.String()) {
@@ -291,7 +291,7 @@ func TestPRView_previewCurrentBranch(t *testing.T) {
 		regexp.MustCompile(`Blueberries are a good fruit`),
 		regexp.MustCompile(`nobody wants to merge 8 commits into master from blueberries`),
 		regexp.MustCompile(`blueberries taste good`),
-		regexp.MustCompile(`View this PR on GitHub: https://github.com/OWNER/REPO/pull/10`),
+		regexp.MustCompile(`View this pull request on GitHub: https://github.com/OWNER/REPO/pull/10`),
 	}
 	for _, r := range expectedLines {
 		if !r.MatchString(output.String()) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func init() {`
`36`	`36`	`issueListCmd.Flags().StringP("state", "s", "", "Filter by state: {open\|closed\|all}")`
`37`	`37`	`issueListCmd.Flags().IntP("limit", "L", 30, "Maximum number of issues to fetch")`
`38`	`38`
`39`		`- issueViewCmd.Flags().BoolP("preview", "p", false, "Preview PR in terminal")`
	`39`	`+ issueViewCmd.Flags().BoolP("preview", "p", false, "Display preview of issue content")`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`var issueCmd = &cobra.Command{`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func init() {`
`32`	`32`	`prListCmd.Flags().StringSliceP("label", "l", nil, "Filter by label")`
`33`	`33`	`prListCmd.Flags().StringP("assignee", "a", "", "Filter by assignee")`
`34`	`34`
`35`		`- prViewCmd.Flags().BoolP("preview", "p", false, "Preview PR in terminal")`
	`35`	`+ prViewCmd.Flags().BoolP("preview", "p", false, "Display preview of pull request content")`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`var prCmd = &cobra.Command{`
`@@ -318,7 +318,7 @@ func printPrPreview(out io.Writer, pr *api.PullRequest) {`
`318`	`318`	`fmt.Fprintln(out)`
`319`	`319`	`fmt.Fprintln(out, utils.RenderMarkdown(pr.Body))`
`320`	`320`	`fmt.Fprintln(out)`
`321`		`- fmt.Fprintf(out, utils.Gray("View this PR on GitHub: %s\n"), pr.URL)`
	`321`	`+ fmt.Fprintf(out, utils.Gray("View this pull request on GitHub: %s\n"), pr.URL)`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	var prURLRE = regexp.MustCompile(`^https://github\.com/([^/]+)/([^/]+)/pull/(\d+)`)