diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-11 15:51:52 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-11 15:51:52 +0700 |
| commit | 0f2f7d2cec8297b1b5645643d7584cde561ce628 (patch) | |
| tree | aa618de9dc399de2e3abf37ad9ecf66d8cb9761f /test/web/websub | |
| parent | 22ac2288be498bd6a5a6fefe2dc6d2e260a8dc39 (diff) | |
| parent | e5d553aa45ffa218b0695d7976f012bfc1dcbafe (diff) | |
| download | pleroma-0f2f7d2cec8297b1b5645643d7584cde561ce628.tar.gz pleroma-0f2f7d2cec8297b1b5645643d7584cde561ce628.zip | |
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Diffstat (limited to 'test/web/websub')
| -rw-r--r-- | test/web/websub/websub_controller_test.exs | 2 | ||||
| -rw-r--r-- | test/web/websub/websub_test.exs | 6 |
2 files changed, 5 insertions, 3 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) 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 |