* Split Create User * Use new create user and User from package user * Add service to wire * Making create user work * Replace user from user pkg * One more * Move Insert to orguser Service/Store * Remove unnecessary conversion * Cleaunp * Fix Get User and add fakes * Fixing get org id for user logic, adding fakes and other adjustments * Add some tests for ourguser service and store * Fix insert org logic * Add comment about deprecation * Fix after merge with main * Move orguser service/store to org service/store * Remove orguser from wire * Unimplement new Create user and use User from pkg user * Fix wire generation * Fix lint * Fix lint - use only User and CrateUserCommand from user pkg * Remove User and CreateUserCommand from models * Fix lint 2
73 lines
1.9 KiB
Go
73 lines
1.9 KiB
Go
package orgimpl
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/grafana/grafana/pkg/services/org"
|
|
"github.com/grafana/grafana/pkg/setting"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestOrgService(t *testing.T) {
|
|
orgStore := newOrgStoreFake()
|
|
orgService := Service{
|
|
store: orgStore,
|
|
cfg: setting.NewCfg(),
|
|
}
|
|
|
|
t.Run("create org", func(t *testing.T) {
|
|
_, err := orgService.GetIDForNewUser(context.Background(), org.GetOrgIDForNewUserCommand{})
|
|
require.NoError(t, err)
|
|
})
|
|
|
|
t.Run("create org", func(t *testing.T) {
|
|
_, err := orgService.GetIDForNewUser(context.Background(), org.GetOrgIDForNewUserCommand{})
|
|
require.NoError(t, err)
|
|
})
|
|
|
|
t.Run("create org with auto assign org ID", func(t *testing.T) {
|
|
setting.AutoAssignOrg = true
|
|
setting.AutoAssignOrgId = 1
|
|
orgStore.ExpectedOrgID = 1
|
|
orgStore.ExpectedOrg = &org.Org{}
|
|
_, err := orgService.GetIDForNewUser(context.Background(), org.GetOrgIDForNewUserCommand{})
|
|
require.NoError(t, err)
|
|
})
|
|
|
|
t.Run("create org with auto assign org ID and orgID", func(t *testing.T) {
|
|
setting.AutoAssignOrg = true
|
|
setting.AutoAssignOrgId = 1
|
|
orgStore.ExpectedOrgID = 1
|
|
orgStore.ExpectedOrg = &org.Org{}
|
|
_, err := orgService.GetIDForNewUser(context.Background(), org.GetOrgIDForNewUserCommand{OrgID: 1})
|
|
require.NoError(t, err)
|
|
})
|
|
|
|
setting.AutoAssignOrg = false
|
|
setting.AutoAssignOrgId = 0
|
|
}
|
|
|
|
type FakeOrgStore struct {
|
|
ExpectedOrg *org.Org
|
|
ExpectedOrgID int64
|
|
ExpectedUserID int64
|
|
ExpectedError error
|
|
}
|
|
|
|
func newOrgStoreFake() *FakeOrgStore {
|
|
return &FakeOrgStore{}
|
|
}
|
|
|
|
func (f *FakeOrgStore) Get(ctx context.Context, orgID int64) (*org.Org, error) {
|
|
return f.ExpectedOrg, f.ExpectedError
|
|
}
|
|
|
|
func (f *FakeOrgStore) Insert(ctx context.Context, org *org.Org) (int64, error) {
|
|
return f.ExpectedOrgID, f.ExpectedError
|
|
}
|
|
|
|
func (f *FakeOrgStore) InsertUser(ctx context.Context, org *org.OrgUser) (int64, error) {
|
|
return f.ExpectedUserID, f.ExpectedError
|
|
}
|