diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-17 07:53:16 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-17 07:53:16 -0400 |
| commit | 6f31d90e2f31ae597b83b2f845d5db938af8e38c (patch) | |
| tree | 81c59b83ffb033df92ff7fba5ffaf3ba5fe7a3cf /cmd/commands/roles_test.go | |
| parent | 319d61123a0418ea9caa9510b8ad1e9a302c7b93 (diff) | |
| parent | 1f6c271b3bedd6656ae7155714423b1b39a669c1 (diff) | |
| download | chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.tar.gz chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.tar.bz2 chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'cmd/commands/roles_test.go')
| -rw-r--r-- | cmd/commands/roles_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/commands/roles_test.go b/cmd/commands/roles_test.go index 7179a9157..4e00aeac8 100644 --- a/cmd/commands/roles_test.go +++ b/cmd/commands/roles_test.go @@ -6,13 +6,13 @@ package commands import ( "testing" - "github.com/mattermost/mattermost-server/api" + "github.com/mattermost/mattermost-server/api4" "github.com/mattermost/mattermost-server/cmd" "github.com/mattermost/mattermost-server/model" ) func TestAssignRole(t *testing.T) { - th := api.Setup().InitBasic() + th := api4.Setup().InitBasic() defer th.TearDown() cmd.CheckCommand(t, "roles", "system_admin", th.BasicUser.Email) |