diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 20:00:51 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 20:00:51 +0300 |
commit | e7fb593d130e0ad62e3690dce4a0913fe3d40ef0 (patch) | |
tree | 8edbc679acda1e5e024884c12cbceb2509417033 /test/web/push/impl_test.exs | |
parent | b03aeae8b935b0a211c51cc3be5f1c15591f5a2f (diff) | |
parent | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (diff) | |
download | pleroma-e7fb593d130e0ad62e3690dce4a0913fe3d40ef0.tar.gz pleroma-e7fb593d130e0ad62e3690dce4a0913fe3d40ef0.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
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 |