diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-18 16:41:16 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-18 16:41:16 +0200 |
| commit | 48f9df2391557db6a9f9dae37b9d39d6cd5f612a (patch) | |
| tree | 9902628481c930e48b003b280516c0bf28260152 /test | |
| parent | a92a9dce94d2a2502750a4a258560283c21e2777 (diff) | |
| download | pleroma-48f9df2391557db6a9f9dae37b9d39d6cd5f612a.tar.gz | |
Keep newlines around.
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 4 | ||||
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index e3d88e74f..dce6025c4 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -67,7 +67,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do } } - content_html = "Some #content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>" + content_html = "Some #content #mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>" content = HtmlSanitizeEx.strip_tags(content_html) date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601 @@ -95,7 +95,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "like_count" => 5, "announcement_count" => 3, "context" => "2hu", - "tag" => ["nsfw", "content"] + "tag" => ["content", "mentioning", "nsfw"] }, "published" => date, "context" => "2hu" diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 3b6a7a1fe..4df1aba9e 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -34,7 +34,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) - assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.<br>This is on another line. #2hu #epic #phantasmagoric<br><a href='http://example.org/image.jpg' class='attachment'>image.jpg</a>" + assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.<br>\nThis is on another line. #2hu #epic #phantasmagoric<br>\n<a href='http://example.org/image.jpg' class='attachment'>image.jpg</a>" assert get_in(activity.data, ["object", "type"]) == "Note" assert get_in(activity.data, ["object", "actor"]) == user.ap_id assert get_in(activity.data, ["actor"]) == user.ap_id |