From 848151f7cbf372d008c178d13c9a74942164c955 Mon Sep 17 00:00:00 2001
From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Wed, 5 Dec 2018 13:37:06 +0300
Subject: [#210] [TwitterAPI] Made actor be stored for uploads. Added ownership
 check to `update_media` action. Added controller tests for `upload` and
 `update_media` actions. Refactoring.

---
 test/support/data_case.ex | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'test/support/data_case.ex')

diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 8eff0fd94..9dde6b5e5 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -36,6 +36,23 @@ defmodule Pleroma.DataCase do
     :ok
   end
 
+  def ensure_local_uploader(_context) do
+    uploader = Pleroma.Config.get([Pleroma.Upload, :uploader])
+    filters = Pleroma.Config.get([Pleroma.Upload, :filters])
+
+    unless uploader == Pleroma.Uploaders.Local || filters != [] do
+      Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+      Pleroma.Config.put([Pleroma.Upload, :filters], [])
+
+      on_exit(fn ->
+        Pleroma.Config.put([Pleroma.Upload, :uploader], uploader)
+        Pleroma.Config.put([Pleroma.Upload, :filters], filters)
+      end)
+    end
+
+    :ok
+  end
+
   @doc """
   A helper that transform changeset errors to a map of messages.
 
-- 
cgit v1.2.3


From 89b3729afa130a62a47ed6372350ebfc5acb4064 Mon Sep 17 00:00:00 2001
From: Maksim Pechnikov <parallel588@gmail.com>
Date: Tue, 11 Dec 2018 15:31:52 +0300
Subject: fix warnings

---
 test/support/data_case.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/support/data_case.ex')

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
 
-- 
cgit v1.2.3


From 3c08d229db423052d0dd88b8a36fb39b0ae81ead Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 23 Dec 2018 20:11:29 +0000
Subject: tests: add legal boilerplate

---
 test/support/data_case.ex | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'test/support/data_case.ex')

diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 53e7234d2..56d5896ad 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_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.DataCase do
   @moduledoc """
   This module defines the setup for tests requiring
-- 
cgit v1.2.3


From e61f0be9518aff867f4c56f5102723eddbcf40f1 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 3 Feb 2019 18:54:39 +0100
Subject: Unbreak all the tests.

---
 test/support/data_case.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/support/data_case.ex')

diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 56d5896ad..df260bd3f 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -32,6 +32,7 @@ defmodule Pleroma.DataCase do
 
   setup tags do
     Cachex.clear(:user_cache)
+    Cachex.clear(:object_cache)
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
 
     unless tags[:async] do
-- 
cgit v1.2.3