aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-22 13:28:34 +0200
committerlain <lain@soykaf.club>2020-04-22 13:28:34 +0200
commitf719a5b23a9bec4ed94f36c07e24aa1413654bae (patch)
tree1036f30a884cd964b696718891954c0f63950f65
parent3c828016d9d1ecb1ebcebb00aaadec2ace37f807 (diff)
downloadpleroma-f719a5b23a9bec4ed94f36c07e24aa1413654bae.tar.gz
WebPush: Return proper values for jobs.
-rw-r--r--lib/pleroma/web/push/impl.ex3
-rw-r--r--test/web/push/impl_test.exs4
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex
index f1740a6e0..a9f893f7b 100644
--- a/lib/pleroma/web/push/impl.ex
+++ b/lib/pleroma/web/push/impl.ex
@@ -55,11 +55,12 @@ defmodule Pleroma.Web.Push.Impl do
|> Jason.encode!()
|> push_message(build_sub(subscription), gcm_api_key, subscription)
end
+ |> (&{:ok, &1}).()
end
def perform(_) do
Logger.warn("Unknown notification type")
- :error
+ {:error, :unknown_type}
end
@doc "Push message to web"
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