diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-04 20:50:28 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-04 20:50:28 +0700 |
commit | 3a3a3996b7a37d281745586fa40bbabd5299a1ce (patch) | |
tree | 843d5295c820fef6d5112677dd1145b3757ad2ac /test/support/data_case.ex | |
parent | 58e250d9d27205116df5634d909ec1e43ea55286 (diff) | |
parent | 89762ad23034668f7440c9fb238dcf270e8c2e59 (diff) | |
download | pleroma-3a3a3996b7a37d281745586fa40bbabd5299a1ce.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
Diffstat (limited to 'test/support/data_case.ex')
-rw-r--r-- | test/support/data_case.ex | 1 |
1 files changed, 1 insertions, 0 deletions
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 |