Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test(git provider): add tests for git providers creation from URL #2119

Merged
merged 13 commits into from Oct 31, 2018
Merged

test(git provider): add tests for git providers creation from URL #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6528070
refactor(git provider): use the the current auth when creating the Gi…
ccojocar Oct 29, 2018
2dd632b
test: add a test to verify the Github provider creation from URL
ccojocar Oct 29, 2018
2da1ed3
test(git provider): add test for creating GitHub provider for multipl…
ccojocar Oct 29, 2018
832b98b
test(git provider): add a test for the case when the user is provided…
ccojocar Oct 29, 2018
e0c6810
test(git provider): use an empty auth config service when reading use…
ccojocar Oct 30, 2018
3ca8ad2
test(git provider): create a fake terminal in the setup function
ccojocar Oct 30, 2018
7cb52c1
test(git provider): add a tets for creating the GitHub provider in in…
ccojocar Oct 30, 2018
fb507cf
test(git provider): add tests for Gitlab git provider
ccojocar Oct 30, 2018
0d3771e
test(git provider): add tests for Gitea provider creation from URL
ccojocar Oct 30, 2018
a55aff1
test(git provider): add tests for bitbucket server provider creation …
ccojocar Oct 30, 2018
d460790
test(git provider): add tests for Bitbucket cloud provider creation f…
ccojocar Oct 30, 2018
3d37bf1
feat(util): add helper function to clean and restore a set of specifi…
ccojocar Oct 31, 2018
518e7d5
test(git provider): clean and restore the provider specific env varia…
ccojocar Oct 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkg/auth/server.go
View file
Open in desktop
Expand Up @@ -50,3 +50,16 @@ func (s *AuthServer) GetUsernames() []string {
sort.Strings(answer)
return answer
}

func (s *AuthServer) HasUserAuths() bool {
return len(s.Users) > 0
}

func (s *AuthServer) CurrentAuth() *UserAuth {
for _, user := range s.Users {
if user.Username == s.CurrentUser {
return user
}
}
return nil
}
22 changes: 11 additions & 11 deletions pkg/gits/provider.go
View file
Open in desktop
Expand Up @@ -322,12 +322,18 @@ func (i *GitRepositoryInfo) CreateProvider(authConfigSvc auth.AuthConfigService,
func CreateProviderForURL(authConfigSvc auth.AuthConfigService, gitKind string, hostUrl string, git Gitter, batchMode bool, in terminal.FileReader, out terminal.FileWriter, errOut io.Writer) (GitProvider, error) {
config := authConfigSvc.Config()
server := config.GetOrCreateServer(hostUrl)
url := server.URL
if gitKind != "" {
server.Kind = gitKind
}
userAuths := authConfigSvc.Config().FindUserAuths(url)
if len(userAuths) == 0 {

var userAuth *auth.UserAuth
if server != nil {
userAuth = server.CurrentAuth()
}

if userAuth != nil && !userAuth.IsInvalid() {
return CreateProvider(server, userAuth, git)
} else {
kind := server.Kind
if kind != "" {
userAuth := auth.CreateAuthUserFromEnvironment(strings.ToUpper(kind))
Expand All @@ -340,16 +346,11 @@ func CreateProviderForURL(authConfigSvc auth.AuthConfigService, gitKind string,
return CreateProvider(server, &userAuth, git)
}
}
if len(userAuths) > 0 {
// TODO use default user???
auth := userAuths[0]
return CreateProvider(server, auth, git)
}
auth, err := createUserForServer(batchMode, authConfigSvc, server, git, in, out, errOut)
userAuth, err := createUserForServer(batchMode, authConfigSvc, server, git, in, out, errOut)
if err != nil {
return nil, err
}
return CreateProvider(server, auth, git)
return CreateProvider(server, userAuth, git)
}

func createUserForServer(batchMode bool, authConfigSvc auth.AuthConfigService, server *auth.AuthServer,
Expand All @@ -361,7 +362,6 @@ func createUserForServer(batchMode bool, authConfigSvc auth.AuthConfigService, s
return nil
}

// TODO could we guess this based on the users ~/.git for github?
defaultUserName := ""
err := authConfigSvc.Config().EditUserAuth(server.Label(), userAuth, defaultUserName, false, batchMode, f, in, out, errOut)
if err != nil {
Expand Down