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

Fixed unit tests

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-01-16 07:45:37 +01:00
parent 04bbdbad12
commit cd5843e977
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/services/sqlstore/accounts_test.go
View File

@ -30,6 +30,16 @@ func TestAccountDataAccess(t *testing.T) {
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(query.Result.Email, ShouldEqual, "ac1@test.com") So(query.Result.Email, ShouldEqual, "ac1@test.com")
So(query.Result.Login, ShouldEqual, "ac1")
})
Convey("Can search accounts", func() {
query := m.SearchAccountsQuery{Query: ""}
err := SearchAccounts(&query)
So(err, ShouldBeNil)
So(query.Result[0].Email, ShouldEqual, "ac1@test.com")
So(query.Result[1].Email, ShouldEqual, "ac2@test.com")
}) })
Convey("Can add collaborator", func() { Convey("Can add collaborator", func() {
@ -44,16 +54,6 @@ func TestAccountDataAccess(t *testing.T) {
So(err, ShouldBeNil) So(err, ShouldBeNil)
}) })
Convey("Collaborator should be included in account info projection", func() {
query := m.GetAccountInfoQuery{Id: ac1.Id}
err = GetAccountInfo(&query)
So(err, ShouldBeNil)
So(query.Result.Collaborators[0].CollaboratorId, ShouldEqual, ac2.Id)
So(query.Result.Collaborators[0].Role, ShouldEqual, m.ROLE_READ_WRITE)
So(query.Result.Collaborators[0].Email, ShouldEqual, "ac2@test.com")
})
Convey("Can get other accounts", func() { Convey("Can get other accounts", func() {
query := m.GetOtherAccountsQuery{AccountId: ac2.Id} query := m.GetOtherAccountsQuery{AccountId: ac2.Id}
err := GetOtherAccounts(&query) err := GetOtherAccounts(&query)

4
pkg/services/sqlstore/tokens.go
View File

@ -1,10 +1,11 @@
package sqlstore package sqlstore
import ( import (
"time"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"github.com/torkelo/grafana-pro/pkg/bus" "github.com/torkelo/grafana-pro/pkg/bus"
m "github.com/torkelo/grafana-pro/pkg/models" m "github.com/torkelo/grafana-pro/pkg/models"
"time"
) )
func init() { func init() {
@ -30,7 +31,6 @@ func DeleteToken(cmd *m.DeleteTokenCommand) error {
} }
func AddToken(cmd *m.AddTokenCommand) error { func AddToken(cmd *m.AddTokenCommand) error {
return inTransaction(func(sess *xorm.Session) error { return inTransaction(func(sess *xorm.Session) error {
t := m.Token{ t := m.Token{
AccountId: cmd.AccountId, AccountId: cmd.AccountId,