summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/views
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-20 13:01:17 +0000
committerlain <lain@soykaf.club>2020-04-20 13:01:17 +0000
commit28165dad3ac02a6d3ba4b0cda51992a1831515dd (patch)
tree8daf198b42657bc47e76f9ee9bc0775f927d8624 /test/web/mastodon_api/views
parentbaeb9fb4517e9175a0ea6c3003a86e12989b7a1a (diff)
parentcf4ebba77471f188ce7da45df0b9ea76dbe31916 (diff)
downloadpleroma-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/views')
-rw-r--r--test/web/mastodon_api/views/subscription_view_test.exs (renamed from test/web/mastodon_api/views/push_subscription_view_test.exs)6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/mastodon_api/views/push_subscription_view_test.exs b/test/web/mastodon_api/views/subscription_view_test.exs
index 10c6082a5..981524c0e 100644
--- a/test/web/mastodon_api/views/push_subscription_view_test.exs
+++ b/test/web/mastodon_api/views/subscription_view_test.exs
@@ -2,10 +2,10 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.Web.MastodonAPI.PushSubscriptionViewTest do
+defmodule Pleroma.Web.MastodonAPI.SubscriptionViewTest do
use Pleroma.DataCase
import Pleroma.Factory
- alias Pleroma.Web.MastodonAPI.PushSubscriptionView, as: View
+ alias Pleroma.Web.MastodonAPI.SubscriptionView, as: View
alias Pleroma.Web.Push
test "Represent a subscription" do
@@ -18,6 +18,6 @@ defmodule Pleroma.Web.MastodonAPI.PushSubscriptionViewTest do
server_key: Keyword.get(Push.vapid_config(), :public_key)
}
- assert expected == View.render("push_subscription.json", %{subscription: subscription})
+ assert expected == View.render("show.json", %{subscription: subscription})
end
end