hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update tests and Oban

Browse source
This commit is contained in:
stwf 2019-11-26 15:24:34 -05:00
commit bd1984f054
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/federation/federation_test.exs
View file

@ -33,8 +33,8 @@ defmodule Pleroma.Integration.FederationTest do
within @federated1 do
import Pleroma.Web.Router.Helpers
user = Pleroma.Factory.insert(:user)
user_url = mastodon_api_url(Pleroma.Web.Endpoint, :user, user)
url_404 = mastodon_api_url(Pleroma.Web.Endpoint, :user, "not-exists")
user_url = account_url(Pleroma.Web.Endpoint, :show, user)
url_404 = account_url(Pleroma.Web.Endpoint, :show, "not-exists")
{user.nickname, user_url, url_404}
end

4
test/test_helper.exs
View file

@ -2,7 +2,9 @@
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
ExUnit.start(exclude: [:federated])
os_exclude = if :os.type() == {:unix, :darwin}, do: [skip_on_mac: true], else: []
ExUnit.start(exclude: [:federated | os_exclude])
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, :manual)
Mox.defmock(Pleroma.ReverseProxy.ClientMock, for: Pleroma.ReverseProxy.Client)
{:ok, _} = Application.ensure_all_started(:ex_machina)