Skip to content

Commit

Permalink
Merge pull request #369 from JarrettSpiker/SsoTeamStringRef
Browse files Browse the repository at this point in the history
Change Team SSOTeamID property from a pointer to a string
  • Loading branch information
sebasslash committed May 23, 2022
2 parents ec7bbc6 + 23586ca commit c2f2ebf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion team.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ type Team struct {
Visibility string `jsonapi:"attr,visibility"`
Permissions *TeamPermissions `jsonapi:"attr,permissions"`
UserCount int `jsonapi:"attr,users-count"`
SSOTeamID *string `jsonapi:"attr,sso-team-id"`
SSOTeamID string `jsonapi:"attr,sso-team-id"`

// Relations
Users []*User `jsonapi:"relation,users"`
Expand Down
8 changes: 4 additions & 4 deletions team_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ func TestTeamsCreate(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, *options.Name, team.Name)

assert.NotNil(t, options.SSOTeamID, team.SSOTeamID)
assert.Equal(t, *options.SSOTeamID, *team.SSOTeamID)
assert.NotNil(t, team.SSOTeamID)
assert.Equal(t, *options.SSOTeamID, team.SSOTeamID)
})

t.Run("when options is missing name", func(t *testing.T) {
Expand Down Expand Up @@ -185,7 +185,7 @@ func TestTeamsRead(t *testing.T) {

t.Run("SSO team id is returned", func(t *testing.T) {
assert.NotNil(t, ssoTeam.SSOTeamID)
assert.Equal(t, *opts.SSOTeamID, *ssoTeam.SSOTeamID)
assert.Equal(t, *opts.SSOTeamID, ssoTeam.SSOTeamID)
})
})

Expand Down Expand Up @@ -336,7 +336,7 @@ func TestTeam_Unmarshal(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, team.ID, "1")
assert.Equal(t, team.Name, "team hashi")
assert.Nil(t, team.SSOTeamID)
assert.Empty(t, team.SSOTeamID)
assert.Equal(t, team.OrganizationAccess.ManageWorkspaces, true)
assert.Equal(t, team.OrganizationAccess.ManageVCSSettings, true)
assert.Equal(t, team.OrganizationAccess.ManagePolicies, true)
Expand Down

0 comments on commit c2f2ebf

Please sign in to comment.