diff options
| author | George Goldberg <george@gberg.me> | 2018-06-01 12:49:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 12:49:02 +0100 |
| commit | 516a097e1ad588d860b374ef1d0eff202adb286b (patch) | |
| tree | c6ca77b0ddee05c5fd2b794f09580a65e672ccaf /api4 | |
| parent | 27e7841a734e9c3ed71f988a653f5865d2ef6f91 (diff) | |
| download | chat-516a097e1ad588d860b374ef1d0eff202adb286b.tar.gz chat-516a097e1ad588d860b374ef1d0eff202adb286b.tar.bz2 chat-516a097e1ad588d860b374ef1d0eff202adb286b.zip | |
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.
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/scheme_test.go | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/api4/scheme_test.go b/api4/scheme_test.go index 67cfda4fc..21a94ca69 100644 --- a/api4/scheme_test.go +++ b/api4/scheme_test.go @@ -44,13 +44,13 @@ func TestCreateScheme(t *testing.T) { assert.NotZero(t, len(s1.DefaultChannelUserRole)) // Check the default roles have been created. - _, roleRes1 := th.SystemAdminClient.GetRole(s1.DefaultTeamAdminRole) + _, roleRes1 := th.SystemAdminClient.GetRoleByName(s1.DefaultTeamAdminRole) CheckNoError(t, roleRes1) - _, roleRes2 := th.SystemAdminClient.GetRole(s1.DefaultTeamUserRole) + _, roleRes2 := th.SystemAdminClient.GetRoleByName(s1.DefaultTeamUserRole) CheckNoError(t, roleRes2) - _, roleRes3 := th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole) + _, roleRes3 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole) CheckNoError(t, roleRes3) - _, roleRes4 := th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole) + _, roleRes4 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole) CheckNoError(t, roleRes4) // Basic Test of a Channel scheme. @@ -77,9 +77,9 @@ func TestCreateScheme(t *testing.T) { assert.NotZero(t, len(s2.DefaultChannelUserRole)) // Check the default roles have been created. - _, roleRes5 := th.SystemAdminClient.GetRole(s2.DefaultChannelAdminRole) + _, roleRes5 := th.SystemAdminClient.GetRoleByName(s2.DefaultChannelAdminRole) CheckNoError(t, roleRes5) - _, roleRes6 := th.SystemAdminClient.GetRole(s2.DefaultChannelUserRole) + _, roleRes6 := th.SystemAdminClient.GetRoleByName(s2.DefaultChannelUserRole) CheckNoError(t, roleRes6) // Try and create a scheme with an invalid scope. @@ -590,13 +590,13 @@ func TestDeleteScheme(t *testing.T) { CheckNoError(t, r1) // Retrieve the roles and check they are not deleted. - role1, roleRes1 := th.SystemAdminClient.GetRole(s1.DefaultTeamAdminRole) + role1, roleRes1 := th.SystemAdminClient.GetRoleByName(s1.DefaultTeamAdminRole) CheckNoError(t, roleRes1) - role2, roleRes2 := th.SystemAdminClient.GetRole(s1.DefaultTeamUserRole) + role2, roleRes2 := th.SystemAdminClient.GetRoleByName(s1.DefaultTeamUserRole) CheckNoError(t, roleRes2) - role3, roleRes3 := th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole) + role3, roleRes3 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole) CheckNoError(t, roleRes3) - role4, roleRes4 := th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole) + role4, roleRes4 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole) CheckNoError(t, roleRes4) assert.Zero(t, role1.DeleteAt) @@ -620,13 +620,13 @@ func TestDeleteScheme(t *testing.T) { CheckNoError(t, r3) // Check the roles were deleted. - role1, roleRes1 = th.SystemAdminClient.GetRole(s1.DefaultTeamAdminRole) + role1, roleRes1 = th.SystemAdminClient.GetRoleByName(s1.DefaultTeamAdminRole) CheckNoError(t, roleRes1) - role2, roleRes2 = th.SystemAdminClient.GetRole(s1.DefaultTeamUserRole) + role2, roleRes2 = th.SystemAdminClient.GetRoleByName(s1.DefaultTeamUserRole) CheckNoError(t, roleRes2) - role3, roleRes3 = th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole) + role3, roleRes3 = th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole) CheckNoError(t, roleRes3) - role4, roleRes4 = th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole) + role4, roleRes4 = th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole) CheckNoError(t, roleRes4) assert.NotZero(t, role1.DeleteAt) @@ -657,9 +657,9 @@ func TestDeleteScheme(t *testing.T) { CheckNoError(t, r1) // Retrieve the roles and check they are not deleted. - role3, roleRes3 := th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole) + role3, roleRes3 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole) CheckNoError(t, roleRes3) - role4, roleRes4 := th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole) + role4, roleRes4 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole) CheckNoError(t, roleRes4) assert.Zero(t, role3.DeleteAt) @@ -681,9 +681,9 @@ func TestDeleteScheme(t *testing.T) { CheckNoError(t, r3) // Check the roles were deleted. - role3, roleRes3 = th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole) + role3, roleRes3 = th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole) CheckNoError(t, roleRes3) - role4, roleRes4 = th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole) + role4, roleRes4 = th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole) CheckNoError(t, roleRes4) assert.NotZero(t, role3.DeleteAt) |