diff options
author | lain <lain@soykaf.club> | 2020-04-20 13:01:17 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-04-20 13:01:17 +0000 |
commit | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (patch) | |
tree | 8daf198b42657bc47e76f9ee9bc0775f927d8624 /test/web/mastodon_api/controllers/subscription_controller_test.exs | |
parent | baeb9fb4517e9175a0ea6c3003a86e12989b7a1a (diff) | |
parent | cf4ebba77471f188ce7da45df0b9ea76dbe31916 (diff) | |
download | pleroma-28165dad3ac02a6d3ba4b0cda51992a1831515dd.tar.gz pleroma-28165dad3ac02a6d3ba4b0cda51992a1831515dd.zip |
Merge branch 'cleanup-subscription-controller' into 'develop'
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
Diffstat (limited to 'test/web/mastodon_api/controllers/subscription_controller_test.exs')
-rw-r--r-- | test/web/mastodon_api/controllers/subscription_controller_test.exs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/web/mastodon_api/controllers/subscription_controller_test.exs b/test/web/mastodon_api/controllers/subscription_controller_test.exs index 987158a74..5682498c0 100644 --- a/test/web/mastodon_api/controllers/subscription_controller_test.exs +++ b/test/web/mastodon_api/controllers/subscription_controller_test.exs @@ -35,7 +35,10 @@ defmodule Pleroma.Web.MastodonAPI.SubscriptionControllerTest do quote do vapid_details = Application.get_env(:web_push_encryption, :vapid_details, []) Application.put_env(:web_push_encryption, :vapid_details, []) - assert "Something went wrong" == unquote(yield) + + assert %{"error" => "Web push subscription is disabled on this Pleroma instance"} == + unquote(yield) + Application.put_env(:web_push_encryption, :vapid_details, vapid_details) end end @@ -45,7 +48,7 @@ defmodule Pleroma.Web.MastodonAPI.SubscriptionControllerTest do assert_error_when_disable_push do conn |> post("/api/v1/push/subscription", %{}) - |> json_response(500) + |> json_response(403) end end @@ -74,7 +77,7 @@ defmodule Pleroma.Web.MastodonAPI.SubscriptionControllerTest do assert_error_when_disable_push do conn |> get("/api/v1/push/subscription", %{}) - |> json_response(500) + |> json_response(403) end end @@ -127,7 +130,7 @@ defmodule Pleroma.Web.MastodonAPI.SubscriptionControllerTest do assert_error_when_disable_push do conn |> put("/api/v1/push/subscription", %{data: %{"alerts" => %{"mention" => false}}}) - |> json_response(500) + |> json_response(403) end end @@ -155,7 +158,7 @@ defmodule Pleroma.Web.MastodonAPI.SubscriptionControllerTest do assert_error_when_disable_push do conn |> delete("/api/v1/push/subscription", %{}) - |> json_response(500) + |> json_response(403) end end |