diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
commit | 4944498133d4a945650201226808b1f09d355014 (patch) | |
tree | 02e83bac731ca6b391b63d826d8230bdb0fdaed8 /test/web/federator_test.exs | |
parent | bac58b152495c3ebf72e3ad1c3102de075fcc366 (diff) | |
parent | ccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916 (diff) | |
download | pleroma-4944498133d4a945650201226808b1f09d355014.tar.gz pleroma-4944498133d4a945650201226808b1f09d355014.zip |
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
Diffstat (limited to 'test/web/federator_test.exs')
-rw-r--r-- | test/web/federator_test.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs index 02e1ca76e..87bf73dbd 100644 --- a/test/web/federator_test.exs +++ b/test/web/federator_test.exs @@ -5,6 +5,11 @@ defmodule Pleroma.Web.FederatorTest do import Pleroma.Factory import Mock + setup_all do + Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) + :ok + end + test "enqueues an element according to priority" do queue = [%{item: 1, priority: 2}] |