diff options
author | rinpatch <rinpatch@sdf.org> | 2020-02-07 16:04:40 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-02-07 16:04:40 +0000 |
commit | 8d01aaa7024757f4a64a5e92e84838e35cb0e37e (patch) | |
tree | b0338e076f697c0e51a267477c57b70d28157f82 /test | |
parent | f13b7878b42e7914248629af8c9c963f7af98d11 (diff) | |
parent | d85bcc86272323797d3a22a85cd99c8b4ddb8833 (diff) | |
download | pleroma-8d01aaa7024757f4a64a5e92e84838e35cb0e37e.tar.gz pleroma-8d01aaa7024757f4a64a5e92e84838e35cb0e37e.zip |
Merge branch 'questions-timezone' into 'develop'
Questions: Add timezone to `closed` property
Closes #1552
See merge request pleroma/pleroma!2184
Diffstat (limited to 'test')
-rw-r--r-- | test/web/mastodon_api/controllers/status_controller_test.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/web/mastodon_api/controllers/status_controller_test.exs b/test/web/mastodon_api/controllers/status_controller_test.exs index b03b4b344..83138d7ef 100644 --- a/test/web/mastodon_api/controllers/status_controller_test.exs +++ b/test/web/mastodon_api/controllers/status_controller_test.exs @@ -370,6 +370,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do assert NaiveDateTime.diff(NaiveDateTime.from_iso8601!(response["poll"]["expires_at"]), time) in 420..430 refute response["poll"]["expred"] + + question = Object.get_by_id(response["poll"]["id"]) + + # closed contains utc timezone + assert question.data["closed"] =~ "Z" end test "option limit is enforced", %{conn: conn} do |