diff options
| author | feld <feld@feld.me> | 2020-01-30 14:13:40 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-01-30 14:13:40 +0000 |
| commit | e2f2602fdc512d502cb41b8cdf07e6cc6362cf48 (patch) | |
| tree | 2c400e87353af07ce25d04bcf12e061b45935081 /test | |
| parent | df200ea7a40c856b876402f0f86b9a679ec5d91e (diff) | |
| parent | b3e9c8772445bfdfe4ec72378fb76c4cf76dc2da (diff) | |
| download | pleroma-e2f2602fdc512d502cb41b8cdf07e6cc6362cf48.tar.gz pleroma-e2f2602fdc512d502cb41b8cdf07e6cc6362cf48.zip | |
Merge branch 'emoji-api-errors' into 'develop'
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/pleroma_api/controllers/emoji_api_controller_test.exs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs index 8e76f2f3d..6f1ea78ec 100644 --- a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs @@ -6,7 +6,6 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do use Pleroma.Web.ConnCase import Tesla.Mock - import Pleroma.Factory @emoji_dir_path Path.join( |