From 1f6c271b3bedd6656ae7155714423b1b39a669c1 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 16 May 2018 13:43:22 -0400 Subject: 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 --- app/command_loadtest.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'app/command_loadtest.go') diff --git a/app/command_loadtest.go b/app/command_loadtest.go index a4a8f003a..8b3cd2e3b 100644 --- a/app/command_loadtest.go +++ b/app/command_loadtest.go @@ -159,7 +159,7 @@ func (me *LoadTestProvider) SetupCommand(a *App, args *model.CommandArgs, messag numPosts, _ = strconv.Atoi(tokens[numArgs+2]) } } - client := model.NewClient(args.SiteURL) + client := model.NewAPIv4Client(args.SiteURL) if doTeams { if err := a.CreateBasicUser(client); err != nil { @@ -193,7 +193,6 @@ func (me *LoadTestProvider) SetupCommand(a *App, args *model.CommandArgs, messag } client.MockSession(args.Session.Token) - client.SetTeamId(args.TeamId) CreateTestEnvironmentInTeam( a, client, @@ -228,8 +227,7 @@ func (me *LoadTestProvider) UsersCommand(a *App, args *model.CommandArgs, messag team = tr.Data.(*model.Team) } - client := model.NewClient(args.SiteURL) - client.SetTeamId(team.Id) + client := model.NewAPIv4Client(args.SiteURL) userCreator := NewAutoUserCreator(a, client, team) userCreator.Fuzzy = doFuzz userCreator.CreateTestUsers(usersr) @@ -258,8 +256,7 @@ func (me *LoadTestProvider) ChannelsCommand(a *App, args *model.CommandArgs, mes team = tr.Data.(*model.Team) } - client := model.NewClient(args.SiteURL) - client.SetTeamId(team.Id) + client := model.NewAPIv4Client(args.SiteURL) client.MockSession(args.Session.Token) channelCreator := NewAutoChannelCreator(client, team) channelCreator.Fuzzy = doFuzz @@ -301,8 +298,7 @@ func (me *LoadTestProvider) PostsCommand(a *App, args *model.CommandArgs, messag } } - client := model.NewClient(args.SiteURL) - client.SetTeamId(args.TeamId) + client := model.NewAPIv4Client(args.SiteURL) client.MockSession(args.Session.Token) testPoster := NewAutoPostCreator(client, args.ChannelId) testPoster.Fuzzy = doFuzz -- cgit v1.2.3-1-g7c22