From 516a097e1ad588d860b374ef1d0eff202adb286b Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Fri, 1 Jun 2018 12:49:02 +0100 Subject: MM-10757: Default roles from scheme should be keyed by name not ID. (#8894) * MM-10757: Default roles from scheme should be keyed by name not ID. * Update permissions import/export. --- store/storetest/team_store.go | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'store/storetest/team_store.go') diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go index b209b48c4..346b55c18 100644 --- a/store/storetest/team_store.go +++ b/store/storetest/team_store.go @@ -12,6 +12,7 @@ import ( "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" + "github.com/stretchr/testify/require" ) func TestTeamStore(t *testing.T, ss store.Store) { @@ -823,6 +824,37 @@ func testGetTeamMember(t *testing.T, ss store.Store) { if r := <-ss.Team().GetMember("", m1.UserId); r.Err == nil { t.Fatal("empty team id - should have failed") } + + // Test with a custom team scheme. + s2 := &model.Scheme{ + Name: model.NewId(), + DisplayName: model.NewId(), + Description: model.NewId(), + Scope: model.SCHEME_SCOPE_TEAM, + } + s2 = (<-ss.Scheme().Save(s2)).Data.(*model.Scheme) + t.Log(s2) + + t2 := store.Must(ss.Team().Save(&model.Team{ + DisplayName: "DisplayName", + Name: "z-z-z" + model.NewId() + "b", + Type: model.TEAM_OPEN, + SchemeId: &s2.Id, + })).(*model.Team) + + defer func() { + <-ss.Team().PermanentDelete(t2.Id) + }() + + m2 := &model.TeamMember{TeamId: t2.Id, UserId: model.NewId(), SchemeUser: true} + store.Must(ss.Team().SaveMember(m2, -1)) + + r2 := <-ss.Team().GetMember(m2.TeamId, m2.UserId) + require.Nil(t, r2.Err) + m3 := r2.Data.(*model.TeamMember) + t.Log(m3) + + assert.Equal(t, s2.DefaultTeamUserRole, m3.Roles) } func testGetTeamMembersByIds(t *testing.T, ss store.Store) { -- cgit v1.2.3-1-g7c22