diff --git a/system/repository/role_test.go b/system/repository/role_test.go index 255c1cc3f..5b358ae6d 100644 --- a/system/repository/role_test.go +++ b/system/repository/role_test.go @@ -18,7 +18,7 @@ func TestRole(t *testing.T) { userRepo := User(context.Background(), factory.Database.MustGet()) user := &types.User{ - Name: "John Doe", + Name: "John Role Doe", Username: "johndoe", } user.GeneratePassword("johndoe") diff --git a/system/repository/user_test.go b/system/repository/user_test.go index 5afc7800e..b34ee648d 100644 --- a/system/repository/user_test.go +++ b/system/repository/user_test.go @@ -17,7 +17,7 @@ func TestUser(t *testing.T) { userRepo := User(context.Background(), factory.Database.MustGet()) user := &types.User{ - Name: "John Doe", + Name: "John User Doe", Username: "johndoe", SatosaID: "1234", } @@ -50,7 +50,7 @@ func TestUser(t *testing.T) { } { - users, err := userRepo.Find(&types.UserFilter{Query: ""}) + users, err := userRepo.Find(&types.UserFilter{Query: "John User Doe"}) assert(t, err == nil, "Owner.Find error: %+v", err) assert(t, len(users) == 1, "Owner.Find: expected 1 user, got %d", len(users)) assert(t, len(users[0].Roles) == 1, "Owner.Find: expected 1 role, got %d", len(users[0].Roles)) diff --git a/system/service/permission.go b/system/service/permission.go index b7b5f3c61..004c1725b 100644 --- a/system/service/permission.go +++ b/system/service/permission.go @@ -49,7 +49,11 @@ func (p *permission) Update(roleID uint64, rules []rules.Rule) (interface{}, err return nil, err } } - return nil, p.resources.Grant(roleID, rules) + err := p.resources.Grant(roleID, rules) + if err != nil { + return nil, err + } + return p.resources.List(roleID) } func (p *permission) Delete(roleID uint64) (interface{}, error) {