diff options
author | Joram Wilander <jwawilander@gmail.com> | 2018-05-16 13:43:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-16 13:43:22 -0400 |
commit | 1f6c271b3bedd6656ae7155714423b1b39a669c1 (patch) | |
tree | 9ce6390c237cc5f7c16d63addb4372033807cff8 /cmd/commands/user_test.go | |
parent | 02f8c18f40cd0e973e4c75b751e8fcbbbd019728 (diff) | |
download | chat-1f6c271b3bedd6656ae7155714423b1b39a669c1.tar.gz chat-1f6c271b3bedd6656ae7155714423b1b39a669c1.tar.bz2 chat-1f6c271b3bedd6656ae7155714423b1b39a669c1.zip |
MM-8708 Remove api package (#8784)
* Remove api package
* Remove api dependency from cmd package
* Remove EnableAPIv3 setting
* Update web tests
* Add more websocket tests
* Move some ws and oauth tests to api4 package
* Move command tests into api4 package
* Test fixes
* Fix msg command test
* Add some app file tests
Diffstat (limited to 'cmd/commands/user_test.go')
-rw-r--r-- | cmd/commands/user_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cmd/commands/user_test.go b/cmd/commands/user_test.go index 8691ac803..e51a6150b 100644 --- a/cmd/commands/user_test.go +++ b/cmd/commands/user_test.go @@ -6,14 +6,14 @@ 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" "github.com/stretchr/testify/require" ) func TestCreateUserWithTeam(t *testing.T) { - th := api.Setup().InitSystemAdmin() + th := api4.Setup().InitBasic().InitSystemAdmin() defer th.TearDown() id := model.NewId() @@ -22,9 +22,9 @@ func TestCreateUserWithTeam(t *testing.T) { cmd.CheckCommand(t, "user", "create", "--email", email, "--password", "mypassword1", "--username", username) - cmd.CheckCommand(t, "team", "add", th.SystemAdminTeam.Id, email) + cmd.CheckCommand(t, "team", "add", th.BasicTeam.Id, email) - profiles := th.SystemAdminClient.Must(th.SystemAdminClient.GetProfilesInTeam(th.SystemAdminTeam.Id, 0, 1000, "")).Data.(map[string]*model.User) + profiles := th.SystemAdminClient.Must(th.SystemAdminClient.GetUsersInTeam(th.BasicTeam.Id, 0, 1000, "")).([]*model.User) found := false @@ -41,7 +41,7 @@ func TestCreateUserWithTeam(t *testing.T) { } func TestCreateUserWithoutTeam(t *testing.T) { - th := api.Setup() + th := api4.Setup() defer th.TearDown() id := model.NewId() @@ -61,18 +61,18 @@ func TestCreateUserWithoutTeam(t *testing.T) { } func TestResetPassword(t *testing.T) { - th := api.Setup().InitBasic() + th := api4.Setup().InitBasic() defer th.TearDown() cmd.CheckCommand(t, "user", "password", th.BasicUser.Email, "password2") - th.BasicClient.Logout() + th.Client.Logout() th.BasicUser.Password = "password2" th.LoginBasic() } func TestMakeUserActiveAndInactive(t *testing.T) { - th := api.Setup().InitBasic() + th := api4.Setup().InitBasic() defer th.TearDown() // first inactivate the user @@ -83,7 +83,7 @@ func TestMakeUserActiveAndInactive(t *testing.T) { } func TestChangeUserEmail(t *testing.T) { - th := api.Setup().InitBasic() + th := api4.Setup().InitBasic() defer th.TearDown() newEmail := model.NewId() + "@mattermost-test.com" |