Commit7c12696

committed

fix unit test

1 parent55e75c2 commit7c12696Copy full SHA for 7c12696

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ func (r RootCmd) newCreateAdminUserCommand() serpent.Command {`
`192`	`192`	`HashedPassword: []byte(hashedPassword),`
`193`	`193`	`CreatedAt:dbtime.Now(),`
`194`	`194`	`UpdatedAt:dbtime.Now(),`
`195`		`-RBACRoles: []string{rbac.RoleOwner()},`
	`195`	`+RBACRoles: []string{rbac.RoleOwner().String()},`
`196`	`196`	`LoginType:database.LoginTypePassword,`
`197`	`197`	`})`
`198`	`198`	`iferr!=nil {`
`@@ -222,7 +222,7 @@ func (r RootCmd) newCreateAdminUserCommand() serpent.Command {`
`222`	`222`	`UserID:newUser.ID,`
`223`	`223`	`CreatedAt:dbtime.Now(),`
`224`	`224`	`UpdatedAt:dbtime.Now(),`
`225`		`-Roles: []string{rbac.ScopedRoleOrgAdmin(org.ID)},`
	`225`	`+Roles: []string{rbac.RoleOrgAdmin()},`
`226`	`226`	`})`
`227`	`227`	`iferr!=nil {`
`228`	`228`	`returnxerrors.Errorf("insert organization member: %w",err)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func TestServerCreateAdminUser(t *testing.T) {`
`56`	`56`	`require.NoError(t,err)`
`57`	`57`	`require.True(t,ok,"password does not match")`
`58`	`58`
`59`		`-require.EqualValues(t, []string{rbac.RoleOwner()},user.RBACRoles,"user does not have owner role")`
	`59`	`+require.EqualValues(t, []string{rbac.RoleOwner().String()},user.RBACRoles,"user does not have owner role")`
`60`	`60`
`61`	`61`	`// Check that user is admin in every org.`
`62`	`62`	`orgs,err:=db.GetOrganizations(ctx)`
`@@ -71,7 +71,7 @@ func TestServerCreateAdminUser(t *testing.T) {`
`71`	`71`	`orgIDs2:=make(map[uuid.UUID]struct{},len(orgMemberships))`
`72`	`72`	`for_,membership:=rangeorgMemberships {`
`73`	`73`	`orgIDs2[membership.OrganizationID]=struct{}{}`
`74`		`-assert.Equal(t, []string{rbac.ScopedRoleOrgAdmin(membership.OrganizationID)},membership.Roles,"user is not org admin")`
	`74`	`+assert.Equal(t, []string{rbac.RoleOrgAdmin()},membership.Roles,"user is not org admin")`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`require.Equal(t,orgIDs,orgIDs2,"user is not in all orgs")`

Comments

(0)