summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/mastodon_api_controller_test.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-07-16 06:06:22 +0000
committerrinpatch <rinpatch@sdf.org>2019-07-16 06:06:22 +0000
commit996fd58ac45447171d1d5049f20f847c9c1b0fc2 (patch)
tree80267a851d4ba391eec87fd94d7c51ff857ac3aa /test/web/mastodon_api/mastodon_api_controller_test.exs
parent9f987dd017f352d63c7441e2cce301aea07082a8 (diff)
parent7a24def4731cf773970c87b340d99d4ec3cd8906 (diff)
downloadpleroma-996fd58ac45447171d1d5049f20f847c9c1b0fc2.tar.gz
pleroma-996fd58ac45447171d1d5049f20f847c9c1b0fc2.zip
Merge branch 'bugfix/poll-id-as-string' into 'develop'
Status View: Poll ids are strings. See merge request pleroma/pleroma!1430
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index af24fddc1..85b4ad024 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -3576,7 +3576,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|> get("/api/v1/polls/#{object.id}")
response = json_response(conn, 200)
- id = object.id
+ id = to_string(object.id)
assert %{"id" => ^id, "expired" => false, "multiple" => false} = response
end