chore: keeping coverage up :D

2 files changed, 24 insertions, 6 deletions

diff --git a/pkg/commands/pull_request.go b/pkg/commands/pull_request.go
index 3b08090e7..fff0978ef 100644
--- a/pkg/commands/pull_request.go
+++ b/pkg/commands/pull_request.go
@@ -29,25 +29,27 @@ type RepoInformation struct {
 
 // NewService builds a Service based on the host type
 func NewService(typeName string, repositoryDomain string, siteDomain string) *Service {
+	var service *Service
+
 	switch typeName {
 	case "github":
-		return &Service{
+		service = &Service{
 			Name:           repositoryDomain,
 			PullRequestURL: fmt.Sprintf("https://%s%s", siteDomain, "/%s/%s/compare/%s?expand=1"),
 		}
 	case "bitbucket":
-		return &Service{
+		service = &Service{
 			Name:           repositoryDomain,
 			PullRequestURL: fmt.Sprintf("https://%s%s", siteDomain, "/%s/%s/pull-requests/new?source=%s&t=1"),
 		}
 	case "gitlab":
-		return &Service{
+		service = &Service{
 			Name:           repositoryDomain,
 			PullRequestURL: fmt.Sprintf("https://%s%s", siteDomain, "/%s/%s/merge_requests/new?merge_request[source_branch]=%s"),
 		}
 	}
 
-	return nil
+	return service
 }
 
 func getServices(config config.AppConfigurer) []*Service {
@@ -61,9 +63,18 @@ func getServices(config config.AppConfigurer) []*Service {
 
 	for repoDomain, typeAndDomain := range configServices {
 		splitData := strings.Split(typeAndDomain, ":")
-		if len(splitData) == 2 {
-			services = append(services, NewService(splitData[0], repoDomain, splitData[1]))
+		if len(splitData) != 2 {
+			// TODO log this misconfiguration
+			continue
+		}
+
+		service := NewService(splitData[0], repoDomain, splitData[1])
+		if service == nil {
+			// TODO log this unsupported service
+			continue
 		}
+
+		services = append(services, service)
 	}
 
 	return services
diff --git a/pkg/commands/pull_request_test.go b/pkg/commands/pull_request_test.go
index 4db29f518..88a012bf2 100644
--- a/pkg/commands/pull_request_test.go
+++ b/pkg/commands/pull_request_test.go
@@ -147,6 +147,13 @@ func TestCreatePullRequest(t *testing.T) {
 			gitCommand := NewDummyGitCommand()
 			gitCommand.OSCommand.command = s.command
 			gitCommand.OSCommand.Config.GetUserConfig().Set("os.openLinkCommand", "open {{link}}")
+			gitCommand.Config.GetUserConfig().Set("services", map[string]string{
+				// valid configuration for a custom service URL
+				"git.work.com": "gitlab:code.work.com",
+				// invalid configurations for a custom service URL
+				"invalid.work.com":   "noservice:invalid.work.com",
+				"noservice.work.com": "noservice.work.com",
+			})
 			dummyPullRequest := NewPullRequest(gitCommand)
 			s.test(dummyPullRequest.Create(s.branch))
 		})