diff --git a/pkg/commands/hosting_service/hosting_service.go b/pkg/commands/hosting_service/hosting_service.go index e054b01b8..42c51c86b 100644 --- a/pkg/commands/hosting_service/hosting_service.go +++ b/pkg/commands/hosting_service/hosting_service.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" "strings" - "net/url" + "net/url" "github.com/go-errors/errors" "github.com/jesseduffield/lazygit/pkg/i18n" diff --git a/pkg/commands/hosting_service/hosting_service_test.go b/pkg/commands/hosting_service/hosting_service_test.go index a94b2edb3..d99281194 100644 --- a/pkg/commands/hosting_service/hosting_service_test.go +++ b/pkg/commands/hosting_service/hosting_service_test.go @@ -220,26 +220,26 @@ func TestGetPullRequestURL(t *testing.T) { }, expectedLoggedErrors: []string{"Unknown git service type: 'noservice'. Expected one of github, bitbucket, gitlab"}, }, - { - testName: "Escapes reserved URL characters in from branch name", - from: "feature/someIssue#123", - to: "master", - remoteUrl: "git@gitlab.com:me/public/repo-with-issues.git", - test: func(url string, err error) { - assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/me/public/repo-with-issues/merge_requests/new?merge_request[source_branch]=feature%2FsomeIssue%23123&merge_request[target_branch]=master", url) - }, - }, - { - testName: "Escapes reserved URL characters in to branch name", - from: "yolo", - to: "archive/never-ending-feature#666", - remoteUrl: "git@gitlab.com:me/public/repo-with-issues.git", - test: func(url string, err error) { - assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/me/public/repo-with-issues/merge_requests/new?merge_request[source_branch]=yolo&merge_request[target_branch]=archive%2Fnever-ending-feature%23666", url) - }, - }, + { + testName: "Escapes reserved URL characters in from branch name", + from: "feature/someIssue#123", + to: "master", + remoteUrl: "git@gitlab.com:me/public/repo-with-issues.git", + test: func(url string, err error) { + assert.NoError(t, err) + assert.Equal(t, "https://gitlab.com/me/public/repo-with-issues/merge_requests/new?merge_request[source_branch]=feature%2FsomeIssue%23123&merge_request[target_branch]=master", url) + }, + }, + { + testName: "Escapes reserved URL characters in to branch name", + from: "yolo", + to: "archive/never-ending-feature#666", + remoteUrl: "git@gitlab.com:me/public/repo-with-issues.git", + test: func(url string, err error) { + assert.NoError(t, err) + assert.Equal(t, "https://gitlab.com/me/public/repo-with-issues/merge_requests/new?merge_request[source_branch]=yolo&merge_request[target_branch]=archive%2Fnever-ending-feature%23666", url) + }, + }, } for _, s := range scenarios {