Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop

2017-12-15 11:53:47 +01:00
parent 75bfe313d7 256f7176a2
commit 8905c8e5fb
5 changed files with 69 additions and 41 deletions
@@ -13,7 +13,7 @@ import (
 func TestTeamApiEndpoint(t *testing.T) {
 	Convey("Given two teams", t, func() {
 		mockResult := models.SearchTeamQueryResult{
-			Teams: []*models.Team{
+			Teams: []*models.SearchTeamDto{
 				{Name: "team1"},
 				{Name: "team2"},
 			},