diff options
| author | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
|---|---|---|
| committer | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
| commit | 602bed85f2b32733f73e2edddb542fa36baac462 (patch) | |
| tree | 06a6ee9b609a9122bc2f0e6f6e6300f9ba79a3aa /api/command.go | |
| parent | a31868336f97a91bfd5a7e91e99a9b294d131f90 (diff) | |
| parent | f439c82d7c885b4c530ba9da0a41b17910743b55 (diff) | |
| download | chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.gz chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.bz2 chat-602bed85f2b32733f73e2edddb542fa36baac462.zip | |
fix conflict
Diffstat (limited to 'api/command.go')
| -rw-r--r-- | api/command.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/command.go b/api/command.go index be1d3229b..bc55f206b 100644 --- a/api/command.go +++ b/api/command.go @@ -341,7 +341,7 @@ func loadTestSetupCommand(c *Context, command *model.Command) bool { } } } else { - client.MockSession(c.Session.Id) + client.MockSession(c.Session.Token) CreateTestEnviromentInTeam( client, c.Session.TeamId, @@ -406,7 +406,7 @@ func loadTestChannelsCommand(c *Context, command *model.Command) bool { channelsr = utils.Range{20, 30} } client := model.NewClient(c.GetSiteURL()) - client.MockSession(c.Session.Id) + client.MockSession(c.Session.Token) channelCreator := NewAutoChannelCreator(client, c.Session.TeamId) channelCreator.Fuzzy = doFuzz channelCreator.CreateTestChannels(channelsr) @@ -458,7 +458,7 @@ func loadTestPostsCommand(c *Context, command *model.Command) bool { } client := model.NewClient(c.GetSiteURL()) - client.MockSession(c.Session.Id) + client.MockSession(c.Session.Token) testPoster := NewAutoPostCreator(client, command.ChannelId) testPoster.Fuzzy = doFuzz testPoster.Users = usernames |