diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 18:51:59 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 18:51:59 +0300 |
| commit | 0062116e07446beea13768d122e5bcb19c60dde7 (patch) | |
| tree | 2c050be2e440364824680fdff3c4499daf118dee /test/web/push/impl_test.exs | |
| parent | 2958a7d246f40141a88bcb7bdd6a477c4f65f0bc (diff) | |
| parent | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (diff) | |
| download | pleroma-0062116e07446beea13768d122e5bcb19c60dde7.tar.gz pleroma-0062116e07446beea13768d122e5bcb19c60dde7.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Diffstat (limited to 'test/web/push/impl_test.exs')
| -rw-r--r-- | test/web/push/impl_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/push/impl_test.exs b/test/web/push/impl_test.exs index 9121d90e7..b2664bf28 100644 --- a/test/web/push/impl_test.exs +++ b/test/web/push/impl_test.exs @@ -63,12 +63,12 @@ defmodule Pleroma.Web.Push.ImplTest do activity: activity ) - assert Impl.perform(notif) == [:ok, :ok] + assert Impl.perform(notif) == {:ok, [:ok, :ok]} end @tag capture_log: true test "returns error if notif does not match " do - assert Impl.perform(%{}) == :error + assert Impl.perform(%{}) == {:error, :unknown_type} end test "successful message sending" do |