diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-09 21:46:16 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-09 21:46:16 +0300 |
| commit | 829e99722396c2372770f50d9fc7cfa40c441005 (patch) | |
| tree | 6b72aa4ac5e049eb8bf444ade64e8da4499ef023 /test/test_helper.exs | |
| parent | 46cf81a544edd91f4c3893897fbe2db053f5f6d5 (diff) | |
| parent | 2bb945cb70751bc8e72c036040130bb54c32f391 (diff) | |
| download | pleroma-829e99722396c2372770f50d9fc7cfa40c441005.tar.gz pleroma-829e99722396c2372770f50d9fc7cfa40c441005.zip | |
[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
Diffstat (limited to 'test/test_helper.exs')
| -rw-r--r-- | test/test_helper.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test_helper.exs b/test/test_helper.exs index f604ba63d..3e33f0335 100644 --- a/test/test_helper.exs +++ b/test/test_helper.exs @@ -3,6 +3,6 @@ # SPDX-License-Identifier: AGPL-3.0-only ExUnit.start() - Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, :manual) +Mox.defmock(Pleroma.ReverseProxy.ClientMock, for: Pleroma.ReverseProxy.Client) {:ok, _} = Application.ensure_all_started(:ex_machina) |