summaryrefslogtreecommitdiff
path: root/test/web/activity_pub
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-02-14 03:55:26 +0000
committerkaniini <nenolod@gmail.com>2019-02-14 03:55:26 +0000
commit19756d68f2b341deac0b630b8e0d351b6ad4b38f (patch)
tree5aa7585c9c825f4a2908344905499d76b2864b66 /test/web/activity_pub
parent6652389e80b736fb64a8d08e2e5f50eb4de9c54b (diff)
parent74579115a73d697aed67abe2dc8ea1a664c89c5b (diff)
downloadpleroma-19756d68f2b341deac0b630b8e0d351b6ad4b38f.tar.gz
pleroma-19756d68f2b341deac0b630b8e0d351b6ad4b38f.zip
Merge branch 'fix/credo-issues-test' into 'develop'
Fix credo issues in ./test See merge request pleroma/pleroma!808
Diffstat (limited to 'test/web/activity_pub')
-rw-r--r--test/web/activity_pub/activity_pub_controller_test.exs9
-rw-r--r--test/web/activity_pub/activity_pub_test.exs5
2 files changed, 11 insertions, 3 deletions
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs
index 9f6d87caa..398bedf77 100644
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@ -5,8 +5,13 @@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
use Pleroma.Web.ConnCase
import Pleroma.Factory
- alias Pleroma.Web.ActivityPub.{UserView, ObjectView}
- alias Pleroma.{Object, Repo, Activity, User, Instances}
+ alias Pleroma.Web.ActivityPub.UserView
+ alias Pleroma.Web.ActivityPub.ObjectView
+ alias Pleroma.Object
+ alias Pleroma.Repo
+ alias Pleroma.Activity
+ alias Pleroma.User
+ alias Pleroma.Instances
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index a55961ac4..a6f8b822a 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -7,7 +7,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.CommonAPI
- alias Pleroma.{Activity, Object, User, Instances}
+ alias Pleroma.Activity
+ alias Pleroma.Object
+ alias Pleroma.User
+ alias Pleroma.Instances
alias Pleroma.Builders.ActivityBuilder
import Pleroma.Factory