created more tests, and removed repoFlag

bchadwic · bchadwic · commit 9c7a788193ed · 2021-06-13T21:05:50.000-07:00
diff --git a/pkg/cmd/browse/browse.go b/pkg/cmd/browse/browse.go
@@ -28,7 +28,6 @@ type BrowseOptions struct {
 
 	Branch       string
 	ProjectsFlag bool
-	RepoFlag     bool
 	SettingsFlag bool
 	WikiFlag     bool
 }
@@ -79,22 +78,22 @@ func NewCmdBrowse(f *cmdutil.Factory, runF func(*BrowseOptions) error) *cobra.Co
 				opts.SelectorArg = args[0]
 			}
 
-			if err := cmdutil.MutuallyExclusive("", opts.ProjectsFlag, opts.SettingsFlag); err != nil {
+			if err := cmdutil.MutuallyExclusive("cannot use --projects with --settings", opts.ProjectsFlag, opts.SettingsFlag); err != nil {
 				return err
 			}
-			if err := cmdutil.MutuallyExclusive("", opts.ProjectsFlag, opts.WikiFlag); err != nil {
+			if err := cmdutil.MutuallyExclusive("cannot use --projects with --wiki", opts.ProjectsFlag, opts.WikiFlag); err != nil {
 				return err
 			}
-			if err := cmdutil.MutuallyExclusive("", opts.ProjectsFlag, opts.Branch != ""); err != nil {
+			if err := cmdutil.MutuallyExclusive("cannot use --projects with --branch", opts.ProjectsFlag, opts.Branch != ""); err != nil {
 				return err
 			}
-			if err := cmdutil.MutuallyExclusive("", opts.SettingsFlag, opts.WikiFlag); err != nil {
+			if err := cmdutil.MutuallyExclusive("cannot use --settings with --wiki", opts.SettingsFlag, opts.WikiFlag); err != nil {
 				return err
 			}
-			if err := cmdutil.MutuallyExclusive("", opts.SettingsFlag, opts.Branch != ""); err != nil {
+			if err := cmdutil.MutuallyExclusive("cannot use --settings with --branch", opts.SettingsFlag, opts.Branch != ""); err != nil {
 				return err
 			}
-			if err := cmdutil.MutuallyExclusive("", opts.WikiFlag, opts.Branch != ""); err != nil {
+			if err := cmdutil.MutuallyExclusive("cannot use --wiki with --branch", opts.WikiFlag, opts.Branch != ""); err != nil {
 				return err
 			}
 
@@ -129,20 +128,17 @@ func runBrowse(opts *BrowseOptions) error {
 	url := ghrepo.GenerateRepoURL(baseRepo, "")
 
 	if opts.ProjectsFlag {
-		url += "/projects"
-		err := opts.Browser.Browse(url)
+		err := opts.Browser.Browse(url + "/projects")
 		return err
 	}
 
 	if opts.SettingsFlag {
-		url += "/settings"
-		err := opts.Browser.Browse(url)
+		err := opts.Browser.Browse(url + "/settings")
 		return err
 	}
 
 	if opts.WikiFlag {
-		url += "/wiki"
-		err := opts.Browser.Browse(url)
+		err := opts.Browser.Browse(url + "/wiki")
 		return err
 	}
 
@@ -177,7 +173,7 @@ func runBrowse(opts *BrowseOptions) error {
 
 	err = opts.Browser.Browse(url)
 	if opts.IO.IsStdoutTTY() && err == nil {
-		fmt.Fprintf(opts.IO.Out, "now opening %s in browser . . .\n", url)
+		fmt.Fprintf(opts.IO.Out, "now opening %s in browser\n", url)
 	}
 	return err
 }
diff --git a/pkg/cmd/browse/browse_test.go b/pkg/cmd/browse/browse_test.go
@@ -89,16 +89,15 @@ func TestNewCmdBrowse(t *testing.T) {
 			wantsErr: false,
 		},
 		{
-			name:     "no arguments",
-			cli:      "",
-			wantsErr: false,
+			name:     "passed two arguments",
+			cli:      "main.go main.go",
+			wantsErr: true,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			f := cmdutil.Factory{}
 			var opts *BrowseOptions
-			// pass a stub implementation of `runBrowse` for testing to avoid having real `runBrowse` called
 			cmd := NewCmdBrowse(&f, func(o *BrowseOptions) error {
 				opts = o
 				return nil
@@ -191,7 +190,7 @@ func Test_runBrowse(t *testing.T) {
 			expectedURL: "https://github.com/bchadwic/cli/issues/217",
 		},
 		{
-			name: "file with line argument",
+			name: "file with line number",
 			opts: BrowseOptions{
 				SelectorArg: "path/to/file.txt:32",
 			},

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ type BrowseOptions struct {`
`28`	`28`
`29`	`29`	`Branch string`
`30`	`30`	`ProjectsFlag bool`
`31`		`- RepoFlag bool`
`32`	`31`	`SettingsFlag bool`
`33`	`32`	`WikiFlag bool`
`34`	`33`	`}`
`@@ -79,22 +78,22 @@ func NewCmdBrowse(f cmdutil.Factory, runF func(BrowseOptions) error) *cobra.Co`
`79`	`78`	`opts.SelectorArg = args[0]`
`80`	`79`	`}`
`81`	`80`
`82`		`- if err := cmdutil.MutuallyExclusive("", opts.ProjectsFlag, opts.SettingsFlag); err != nil {`
	`81`	`+ if err := cmdutil.MutuallyExclusive("cannot use --projects with --settings", opts.ProjectsFlag, opts.SettingsFlag); err != nil {`
`83`	`82`	`return err`
`84`	`83`	`}`
`85`		`- if err := cmdutil.MutuallyExclusive("", opts.ProjectsFlag, opts.WikiFlag); err != nil {`
	`84`	`+ if err := cmdutil.MutuallyExclusive("cannot use --projects with --wiki", opts.ProjectsFlag, opts.WikiFlag); err != nil {`
`86`	`85`	`return err`
`87`	`86`	`}`
`88`		`- if err := cmdutil.MutuallyExclusive("", opts.ProjectsFlag, opts.Branch != ""); err != nil {`
	`87`	`+ if err := cmdutil.MutuallyExclusive("cannot use --projects with --branch", opts.ProjectsFlag, opts.Branch != ""); err != nil {`
`89`	`88`	`return err`
`90`	`89`	`}`
`91`		`- if err := cmdutil.MutuallyExclusive("", opts.SettingsFlag, opts.WikiFlag); err != nil {`
	`90`	`+ if err := cmdutil.MutuallyExclusive("cannot use --settings with --wiki", opts.SettingsFlag, opts.WikiFlag); err != nil {`
`92`	`91`	`return err`
`93`	`92`	`}`
`94`		`- if err := cmdutil.MutuallyExclusive("", opts.SettingsFlag, opts.Branch != ""); err != nil {`
	`93`	`+ if err := cmdutil.MutuallyExclusive("cannot use --settings with --branch", opts.SettingsFlag, opts.Branch != ""); err != nil {`
`95`	`94`	`return err`
`96`	`95`	`}`
`97`		`- if err := cmdutil.MutuallyExclusive("", opts.WikiFlag, opts.Branch != ""); err != nil {`
	`96`	`+ if err := cmdutil.MutuallyExclusive("cannot use --wiki with --branch", opts.WikiFlag, opts.Branch != ""); err != nil {`
`98`	`97`	`return err`
`99`	`98`	`}`
`100`	`99`
`@@ -129,20 +128,17 @@ func runBrowse(opts *BrowseOptions) error {`
`129`	`128`	`url := ghrepo.GenerateRepoURL(baseRepo, "")`
`130`	`129`
`131`	`130`	`if opts.ProjectsFlag {`
`132`		`- url += "/projects"`
`133`		`- err := opts.Browser.Browse(url)`
	`131`	`+ err := opts.Browser.Browse(url + "/projects")`
`134`	`132`	`return err`
`135`	`133`	`}`
`136`	`134`
`137`	`135`	`if opts.SettingsFlag {`
`138`		`- url += "/settings"`
`139`		`- err := opts.Browser.Browse(url)`
	`136`	`+ err := opts.Browser.Browse(url + "/settings")`
`140`	`137`	`return err`
`141`	`138`	`}`
`142`	`139`
`143`	`140`	`if opts.WikiFlag {`
`144`		`- url += "/wiki"`
`145`		`- err := opts.Browser.Browse(url)`
	`141`	`+ err := opts.Browser.Browse(url + "/wiki")`
`146`	`142`	`return err`
`147`	`143`	`}`
`148`	`144`
`@@ -177,7 +173,7 @@ func runBrowse(opts *BrowseOptions) error {`
`177`	`173`
`178`	`174`	`err = opts.Browser.Browse(url)`
`179`	`175`	`if opts.IO.IsStdoutTTY() && err == nil {`
`180`		`- fmt.Fprintf(opts.IO.Out, "now opening %s in browser . . .\n", url)`
	`176`	`+ fmt.Fprintf(opts.IO.Out, "now opening %s in browser\n", url)`
`181`	`177`	`}`
`182`	`178`	`return err`
`183`	`179`	`}`