IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

api: removes import alias + some unused fields

Browse Source
This commit is contained in:
Daniel Lee
2017-02-08 11:57:05 +01:00
parent 8aa5b62d6d
commit fbc3c3dd32
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/api/datasources_test.go
View File

@@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
macaron "gopkg.in/macaron.v1" macaron "gopkg.in/macaron.v1"
"github.com/go-macaron/session" "github.com/go-macaron/session"
@@ -26,9 +26,9 @@ func TestDataSourcesProxy(t *testing.T) {
loggedInUserScenario("When calling GET on", "/api/datasources/", func(sc *scenarioContext) { loggedInUserScenario("When calling GET on", "/api/datasources/", func(sc *scenarioContext) {
// Stubs the database query // Stubs the database query
bus.AddHandler("test", func(query *m.GetDataSourcesQuery) error { bus.AddHandler("test", func(query *models.GetDataSourcesQuery) error {
So(query.OrgId, ShouldEqual, TestOrgID) So(query.OrgId, ShouldEqual, TestOrgID)
query.Result = []*m.DataSource{ query.Result = []*models.DataSource{
{Name: "mmm"}, {Name: "mmm"},
{Name: "ZZZ"}, {Name: "ZZZ"},
{Name: "BBB"}, {Name: "BBB"},
@@ -75,7 +75,7 @@ func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
sc.context = c sc.context = c
sc.context.UserId = TestUserID sc.context.UserId = TestUserID
sc.context.OrgId = TestOrgID sc.context.OrgId = TestOrgID
sc.context.OrgRole = m.ROLE_EDITOR sc.context.OrgRole = models.ROLE_EDITOR
if sc.handlerFunc != nil { if sc.handlerFunc != nil {
sc.handlerFunc(sc.context) sc.handlerFunc(sc.context)
} }
@@ -100,23 +100,12 @@ type scenarioContext struct {
m *macaron.Macaron m *macaron.Macaron
context *middleware.Context context *middleware.Context
resp *httptest.ResponseRecorder resp *httptest.ResponseRecorder
apiKey string
authHeader string
handlerFunc handlerFunc handlerFunc handlerFunc
defaultHandler macaron.Handler defaultHandler macaron.Handler
req *http.Request req *http.Request
} }
func (sc *scenarioContext) exec() { func (sc *scenarioContext) exec() {
if sc.apiKey != "" {
sc.req.Header.Add("Authorization", "Bearer "+sc.apiKey)
}
if sc.authHeader != "" {
sc.req.Header.Add("Authorization", sc.authHeader)
}
sc.m.ServeHTTP(sc.resp, sc.req) sc.m.ServeHTTP(sc.resp, sc.req)
} }