summaryrefslogtreecommitdiff
path: root/test/web/websub/websub_controller_test.exs
diff options
context:
space:
mode:
authorlink0ff <juri@linkov.net>2019-03-14 17:43:30 +0200
committerlink0ff <juri@linkov.net>2019-03-14 17:43:30 +0200
commit54e7087ab412a488f8ad7286aef89d313e5e7b14 (patch)
tree9391107eb5aec3940bf6150539acc38e85224751 /test/web/websub/websub_controller_test.exs
parent9338f061a303ae3d57a8ea1af524c2ca51929f8d (diff)
parent59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef (diff)
downloadpleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.tar.gz
pleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.zip
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
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)