diff options
author | Mike Verdone <spiral@arcseconds.net> | 2019-07-24 17:09:59 +0200 |
---|---|---|
committer | Mike Verdone <spiral@arcseconds.net> | 2019-07-24 17:09:59 +0200 |
commit | 2c83eb0b157b2f574f55341e9171f0b5ab7bd3b2 (patch) | |
tree | c52ea70a7f01e436eedd0065e04e86911accb1f6 /test | |
parent | 877575d0da830724e822eac2de243391aaea7ec8 (diff) | |
download | pleroma-2c83eb0b157b2f574f55341e9171f0b5ab7bd3b2.tar.gz |
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
This reverts commit 2981821db834448bf9b2ba26590314e36201664c.
Diffstat (limited to 'test')
-rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 2 | ||||
-rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index a9d38c06e..e59908979 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -170,7 +170,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do assert activity = Activity.get_by_id(fourth_id) assert expiration = ActivityExpiration.get_by_activity_id(fourth_id) assert expiration.scheduled_at == expires_at - assert fourth_response["pleroma"]["expires_in"] > 0 + assert fourth_response["pleroma"]["expires_at"] == NaiveDateTime.to_iso8601(expires_at) end test "replying to a status", %{conn: conn} do diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index eb0874ab2..073c69659 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -134,7 +134,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do in_reply_to_account_acct: nil, content: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["content"])}, spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["summary"])}, - expires_in: nil + expires_at: nil } } |