summaryrefslogtreecommitdiff
path: root/test/web/websub/websub_controller_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivant.business@gmail.com>2019-03-15 17:11:00 +0300
committerIvan Tashkinov <ivant.business@gmail.com>2019-03-15 17:11:00 +0300
commit273905744242b013ba9736ff7e1415a0499022d1 (patch)
tree146f5ad5428130dce0076ea9f6398035d7ac88f6 /test/web/websub/websub_controller_test.exs
parentaacbf0f57053786533df045125dee93ace0daa93 (diff)
parent41fc67aa4993c119dae82578df7309d3999ac47a (diff)
downloadpleroma-273905744242b013ba9736ff7e1415a0499022d1.tar.gz
pleroma-273905744242b013ba9736ff7e1415a0499022d1.zip
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
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)