diff options
author | Roger Braun <roger@rogerbraun.net> | 2017-06-18 18:59:13 +0200 |
---|---|---|
committer | Roger Braun <roger@rogerbraun.net> | 2017-06-18 18:59:13 +0200 |
commit | fa828229326c5c0d8fc2d119e8cf0d70a63c5ef9 (patch) | |
tree | a59f584394248673981a122e742a529108923d5b /test | |
parent | d00571ff75567aa43618f660205faeac6e9485fb (diff) | |
download | pleroma-fa828229326c5c0d8fc2d119e8cf0d70a63c5ef9.tar.gz |
Revert "Add invisible tags to TwAPI output."
This reverts commit a92a9dce94d2a2502750a4a258560283c21e2777.
Diffstat (limited to 'test')
-rw-r--r-- | test/support/httpoison_mock.ex | 2 | ||||
-rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/support/httpoison_mock.ex b/test/support/httpoison_mock.ex index 54375d929..420d42a0d 100644 --- a/test/support/httpoison_mock.ex +++ b/test/support/httpoison_mock.ex @@ -23,7 +23,7 @@ defmodule HTTPoisonMock do body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_23211.xml") }} end - + def get("https://social.heldscal.la/.well-known/webfinger", [Accept: "application/xrd+xml"], [params: [resource: "https://social.heldscal.la/user/29191"]]) do {:ok, %Response{ status_code: 200, diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index db5981b58..96178c2cc 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 = "<script>alert('YAY')</script>Some #content #mentioning <a href='#{mentioned_user.ap_id}'>@shp</a>" + content_html = "<script>alert('YAY')</script>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 @@ -108,8 +108,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "user" => UserRepresenter.to_map(user, %{for: follower}), "is_local" => true, "attentions" => [], - "statusnet_html" => HtmlSanitizeEx.basic_html(content_html) <> "<br />\n#nsfw", - "text" => content <> "\n#nsfw", + "statusnet_html" => HtmlSanitizeEx.basic_html(content_html), + "text" => content, "is_post_verb" => true, "created_at" => "Tue May 24 13:26:08 +0000 2016", "in_reply_to_status_id" => 213123, |