summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/object/containment_test.exs2
-rw-r--r--test/object_test.exs6
-rw-r--r--test/web/common_api/common_api_test.exs2
-rw-r--r--test/web/mastodon_api/status_view_test.exs4
4 files changed, 10 insertions, 4 deletions
diff --git a/test/object/containment_test.exs b/test/object/containment_test.exs
index cb74c9f4f..452064093 100644
--- a/test/object/containment_test.exs
+++ b/test/object/containment_test.exs
@@ -1,8 +1,8 @@
defmodule Pleroma.Object.ContainmentTest do
use Pleroma.DataCase
- alias Pleroma.User
alias Pleroma.Object.Containment
+ alias Pleroma.User
import Pleroma.Factory
diff --git a/test/object_test.exs b/test/object_test.exs
index a30efd48c..d138ee091 100644
--- a/test/object_test.exs
+++ b/test/object_test.exs
@@ -5,9 +5,15 @@
defmodule Pleroma.ObjectTest do
use Pleroma.DataCase
import Pleroma.Factory
+ import Tesla.Mock
alias Pleroma.Object
alias Pleroma.Repo
+ setup do
+ mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
+ :ok
+ end
+
test "returns an object by it's AP id" do
object = insert(:note)
found_object = Object.get_by_ap_id(object.data["id"])
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs
index b9ed088e4..e12cc04c8 100644
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@@ -5,8 +5,8 @@
defmodule Pleroma.Web.CommonAPITest do
use Pleroma.DataCase
alias Pleroma.Activity
- alias Pleroma.User
alias Pleroma.Object
+ alias Pleroma.User
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index cc5a84b5d..ad6344006 100644
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -6,9 +6,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
use Pleroma.DataCase
alias Pleroma.Activity
- alias Pleroma.User
- alias Pleroma.Repo
alias Pleroma.Object
+ alias Pleroma.Repo
+ alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView