Merge branch 'master' into develop

This commit is contained in:
Eliot Berriot 2019-03-07 13:44:33 +01:00
commit 491c79efa0
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
10 changed files with 73 additions and 17 deletions

View file

@ -123,9 +123,12 @@ def test_user_can_accept_or_reject_own_follows(
assert follow.approved is expected
mocked_dispatch.assert_called_once_with(
{"type": "Accept"}, context={"follow": follow}
)
if action == "accept":
mocked_dispatch.assert_called_once_with(
{"type": "Accept"}, context={"follow": follow}
)
if action == "reject":
mocked_dispatch.assert_not_called()
def test_user_can_list_inbox_items(factories, logged_in_api_client):