Revert "Merge branch 'streamer-refactoring' into 'develop'"

[akkoma] / test / support / conn_case.ex

diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index a83ef3b3ab96894d2d06b3620d41cb53eb62eea0..ec5892ff53f45ca182ef70d37472d2b20b7b4d8f 100644 (file)
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.ConnCase do
   @moduledoc """
   This module defines the test case to be used by
@@ -19,6 +23,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
@@ -26,14 +31,15 @@ defmodule Pleroma.Web.ConnCase do
     end
   end
 
-
   setup tags do
     Cachex.clear(:user_cache)
+    Cachex.clear(:object_cache)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
+
     unless tags[:async] do
       Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
     end
+
     {:ok, conn: Phoenix.ConnTest.build_conn()}
   end
-
 end