summaryrefslogtreecommitdiff
path: root/test/web/websub/websub_controller_test.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-04-02 15:41:30 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-04-02 15:41:30 +0700
commita1869f5272ddd83cdf2b2fc487668de79f2d0c6d (patch)
treedef42bef14e8ced310471a194080e38cbee15452 /test/web/websub/websub_controller_test.exs
parent16e598ec11cb9178b9fc53a1ec4b649d97c5f3b8 (diff)
parentf8aa917eef9280631a5cd2c95cf1db8fab6e14e5 (diff)
downloadpleroma-a1869f5272ddd83cdf2b2fc487668de79f2d0c6d.tar.gz
pleroma-a1869f5272ddd83cdf2b2fc487668de79f2d0c6d.zip
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
Diffstat (limited to 'test/web/websub/websub_controller_test.exs')
-rw-r--r--test/web/websub/websub_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/websub/websub_controller_test.exs b/test/web/websub/websub_controller_test.exs
index 87b01d89b..1e69ed01a 100644
--- a/test/web/websub/websub_controller_test.exs
+++ b/test/web/websub/websub_controller_test.exs
@@ -5,10 +5,10 @@
defmodule Pleroma.Web.Websub.WebsubControllerTest do
use Pleroma.Web.ConnCase
import Pleroma.Factory
- alias Pleroma.Web.Websub.WebsubClientSubscription
alias Pleroma.Activity
alias Pleroma.Repo
alias Pleroma.Web.Websub
+ alias Pleroma.Web.Websub.WebsubClientSubscription
test "websub subscription request", %{conn: conn} do
user = insert(:user)