From 1e7985a87a72bea9a308cf1506dacc828c6e2e1c Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 13 Sep 2016 12:42:48 -0400 Subject: Modifying permissions system. (#3897) --- web/web_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'web/web_test.go') diff --git a/web/web_test.go b/web/web_test.go index 5f74430fa..21819191b 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -83,8 +83,10 @@ func TestGetAccessToken(t *testing.T) { ApiClient.Must(ApiClient.LoginById(ruser.Id, "passwd1")) ApiClient.SetTeamId(rteam.Data.(*model.Team).Id) *utils.Cfg.ServiceSettings.EnableOnlyAdminIntegrations = false + utils.SetDefaultRolesBasedOnConfig() app = ApiClient.Must(ApiClient.RegisterApp(app)).Data.(*model.OAuthApp) *utils.Cfg.ServiceSettings.EnableOnlyAdminIntegrations = true + utils.SetDefaultRolesBasedOnConfig() redirect := ApiClient.Must(ApiClient.AllowOAuth(model.AUTHCODE_RESPONSE_TYPE, app.Id, app.CallbackUrls[0], "all", "123")).Data.(map[string]string)["redirect"] rurl, _ := url.Parse(redirect) @@ -207,7 +209,7 @@ func TestIncomingWebhook(t *testing.T) { c := &api.Context{} c.RequestId = model.NewId() c.IpAddress = "cmd_line" - api.UpdateUserRoles(c, user, model.ROLE_SYSTEM_ADMIN) + api.UpdateUserRoles(c, user, model.ROLE_SYSTEM_ADMIN.Id) ApiClient.Login(user.Email, "passwd1") ApiClient.SetTeamId(team.Id) -- cgit v1.2.3-1-g7c22