6 files changed, 33 insertions, 2 deletions
diff --git a/test/support/builders/activity_builder.ex b/test/support/builders/activity_builder.ex
index eb72d5ba9..6e5a8e059 100644
--- a/test/support/builders/activity_builder.ex
+++ b/test/support/builders/activity_builder.ex
@@ -1,5 +1,4 @@
 defmodule Pleroma.Builders.ActivityBuilder do
-  alias Pleroma.Builders.UserBuilder
   alias Pleroma.Web.ActivityPub.ActivityPub
 
   def build(data \\ %{}, opts \\ %{}) do
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index 2e6707087..d25c28f49 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -19,6 +19,7 @@ defmodule Pleroma.Web.ConnCase do
     quote do
       # Import conveniences for testing with connections
       use Phoenix.ConnTest
+      use Pleroma.Tests.Helpers
       import Pleroma.Web.Router.Helpers
 
       # The default endpoint for testing
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 9dde6b5e5..53e7234d2 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -22,6 +22,7 @@ defmodule Pleroma.DataCase do
       import Ecto.Changeset
       import Ecto.Query
       import Pleroma.DataCase
+      use Pleroma.Tests.Helpers
     end
   end
 
diff --git a/test/support/helpers.ex b/test/support/helpers.ex
new file mode 100644
index 000000000..64b6b1900
--- /dev/null
+++ b/test/support/helpers.ex
@@ -0,0 +1,25 @@
+defmodule Pleroma.Tests.Helpers do
+  @moduledoc """
+  Helpers for use in tests.
+  """
+
+  defmacro __using__(_opts) do
+    quote do
+      def refresh_record(%{id: id, __struct__: model} = _),
+        do: refresh_record(model, %{id: id})
+
+      def refresh_record(model, %{id: id} = _) do
+        Pleroma.Repo.get_by(model, id: id)
+      end
+
+      # Used for comparing json rendering during tests.
+      def render_json(view, template, assigns) do
+        assigns = Map.new(assigns)
+
+        view.render(template, assigns)
+        |> Poison.encode!()
+        |> Poison.decode!()
+      end
+    end
+  end
+end
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index 391342ad7..6f98fc5d0 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -13,7 +13,7 @@ defmodule HttpRequestMock do
     with {:ok, res} <- apply(__MODULE__, method, [url, query, body, headers]) do
       res
     else
-      {_, r} = error ->
+      {_, _r} = error ->
         # Logger.warn(r)
         error
     end
diff --git a/test/support/websub_mock.ex b/test/support/websub_mock.ex
new file mode 100644
index 000000000..0cba0b740
--- /dev/null
+++ b/test/support/websub_mock.ex
@@ -0,0 +1,5 @@
+defmodule Pleroma.Web.WebsubMock do
+  def verify(sub) do
+    {:ok, sub}
+  end
+end