summaryrefslogtreecommitdiff
path: root/test/web/websub/websub_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-02-12 10:24:15 +0100
committerlain <lain@soykaf.club>2018-02-12 10:24:15 +0100
commitb331cb449a46bbead19fea4fba59762c1a2e3a10 (patch)
tree5ce081e6f6b6b6305ec8a280adb53a64fd08a941 /test/web/websub/websub_controller_test.exs
parent8cf97ee8e15a36cbbf0964d5be53c88d29798163 (diff)
parent1bc34de4dfef5336d0dc165495ac66de2ffef2c6 (diff)
downloadpleroma-b331cb449a46bbead19fea4fba59762c1a2e3a10.tar.gz
pleroma-b331cb449a46bbead19fea4fba59762c1a2e3a10.zip
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'test/web/websub/websub_controller_test.exs')
-rw-r--r--test/web/websub/websub_controller_test.exs7
1 files changed, 0 insertions, 7 deletions
diff --git a/test/web/websub/websub_controller_test.exs b/test/web/websub/websub_controller_test.exs
index 0aa0fdff7..f6b86eca0 100644
--- a/test/web/websub/websub_controller_test.exs
+++ b/test/web/websub/websub_controller_test.exs
@@ -74,10 +74,3 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
assert length(Repo.all(Activity)) == 0
end
end
-
-defmodule Pleroma.Web.OStatusMock do
- import Pleroma.Factory
- def handle_incoming(_doc) do
- insert(:note_activity)
- end
-end