public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: use Wrap for all admin API (#26673)

Browse Source 
* Chore: use Wrap for all admin API

* API: fix admin tests
This commit is contained in:
Agnès Toulet
2020-07-29 18:00:14 +02:00
committed by GitHub
parent ec76d69b49
commit 7a5464fe10
4 changed files with 37 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/admin_users_test.go
+6 -6
View File
@@ -266,13 +266,13 @@ func putAdminScenario(desc string, url string, routePattern string, role models.
defer bus.ClearBusHandlers()
sc := setupScenarioContext(url)
sc.defaultHandler = Wrap(func(c *models.ReqContext) {
sc.defaultHandler = Wrap(func(c *models.ReqContext) Response {
sc.context = c
sc.context.UserId = TestUserID
sc.context.OrgId = TestOrgID
sc.context.OrgRole = role
AdminUpdateUserPermissions(c, cmd)
return AdminUpdateUserPermissions(c, cmd)
})
sc.m.Put(routePattern, sc.defaultHandler)
@@ -396,11 +396,11 @@ func adminDeleteUserScenario(desc string, url string, routePattern string, fn sc
defer bus.ClearBusHandlers()
sc := setupScenarioContext(url)
sc.defaultHandler = Wrap(func(c *models.ReqContext) {
sc.defaultHandler = Wrap(func(c *models.ReqContext) Response {
sc.context = c
sc.context.UserId = TestUserID
AdminDeleteUser(c)
return AdminDeleteUser(c)
})
sc.m.Delete(routePattern, sc.defaultHandler)
@@ -414,11 +414,11 @@ func adminCreateUserScenario(desc string, url string, routePattern string, cmd d
defer bus.ClearBusHandlers()
sc := setupScenarioContext(url)
sc.defaultHandler = Wrap(func(c *models.ReqContext) {
sc.defaultHandler = Wrap(func(c *models.ReqContext) Response {
sc.context = c
sc.context.UserId = TestUserID
AdminCreateUser(c, cmd)
return AdminCreateUser(c, cmd)
})
sc.m.Post(routePattern, sc.defaultHandler)