diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-02 03:50:56 -0500 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-10-02 09:50:56 +0100 |
| commit | 9bc7af0c5704bbf73f8240b4569d5ea215352e39 (patch) | |
| tree | b17ddafc83ab43ccdce2116e83358299a08a50a6 /api/emoji_test.go | |
| parent | b84736e9b6401df0c6eeab9950bef09458a6aefd (diff) | |
| download | chat-9bc7af0c5704bbf73f8240b4569d5ea215352e39.tar.gz chat-9bc7af0c5704bbf73f8240b4569d5ea215352e39.tar.bz2 chat-9bc7af0c5704bbf73f8240b4569d5ea215352e39.zip | |
Don't use global app for api / api4 tests (#7528)
* don't use global app for api / api4 tests
* put sleep back. we're gonna have to do some goroutine wrangling
* fix oauth test config assumptions
* jobs package, i'm comin' for you next
* app test fix
* try increasing sleep a little
Diffstat (limited to 'api/emoji_test.go')
| -rw-r--r-- | api/emoji_test.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/api/emoji_test.go b/api/emoji_test.go index 443fe7758..5ee034e9c 100644 --- a/api/emoji_test.go +++ b/api/emoji_test.go @@ -18,6 +18,8 @@ import ( func TestGetEmoji(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + Client := th.BasicClient EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -96,6 +98,8 @@ func TestGetEmoji(t *testing.T) { func TestCreateEmoji(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() + defer th.TearDown() + Client := th.BasicClient EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -218,6 +222,8 @@ func TestCreateEmoji(t *testing.T) { func TestDeleteEmoji(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() + defer th.TearDown() + Client := th.BasicClient EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji @@ -276,6 +282,8 @@ func createTestEmoji(t *testing.T, a *app.App, emoji *model.Emoji, imageData []b func TestGetEmojiImage(t *testing.T) { th := Setup().InitBasic() + defer th.TearDown() + Client := th.BasicClient EnableCustomEmoji := *utils.Cfg.ServiceSettings.EnableCustomEmoji |