diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-02 15:41:30 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-02 15:41:30 +0700 |
commit | a1869f5272ddd83cdf2b2fc487668de79f2d0c6d (patch) | |
tree | def42bef14e8ced310471a194080e38cbee15452 /test/web/websub/websub_test.exs | |
parent | 16e598ec11cb9178b9fc53a1ec4b649d97c5f3b8 (diff) | |
parent | f8aa917eef9280631a5cd2c95cf1db8fab6e14e5 (diff) | |
download | pleroma-a1869f5272ddd83cdf2b2fc487668de79f2d0c6d.tar.gz pleroma-a1869f5272ddd83cdf2b2fc487668de79f2d0c6d.zip |
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
Diffstat (limited to 'test/web/websub/websub_test.exs')
-rw-r--r-- | test/web/websub/websub_test.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs index 9a9b9df02..74386d7db 100644 --- a/test/web/websub/websub_test.exs +++ b/test/web/websub/websub_test.exs @@ -4,11 +4,13 @@ defmodule Pleroma.Web.WebsubTest do use Pleroma.DataCase + + alias Pleroma.Web.Router.Helpers alias Pleroma.Web.Websub - alias Pleroma.Web.Websub.WebsubServerSubscription alias Pleroma.Web.Websub.WebsubClientSubscription + alias Pleroma.Web.Websub.WebsubServerSubscription + import Pleroma.Factory - alias Pleroma.Web.Router.Helpers import Tesla.Mock setup do |