summaryrefslogtreecommitdiff
path: root/test/web/twitter_api
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-18 00:38:09 +0000
committerkaniini <nenolod@gmail.com>2019-03-18 00:38:09 +0000
commit1344e34ed3a337b54e450af474f81e2f326bf768 (patch)
tree56b06a4c41d008de4daed33f6119a66a059d3691 /test/web/twitter_api
parent6d6f48d0795cc12d3c5aca5d90ae51b10086996d (diff)
parent4ed2618f6c732ba1009510f5698a5d981a151925 (diff)
downloadpleroma-1344e34ed3a337b54e450af474f81e2f326bf768.tar.gz
pleroma-1344e34ed3a337b54e450af474f81e2f326bf768.zip
Merge branch 'feature/allow-link-rel-attribute' into 'develop'
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition). See merge request pleroma/pleroma!946
Diffstat (limited to 'test/web/twitter_api')
-rw-r--r--test/web/twitter_api/views/activity_view_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs
index 6f0786b1c..d9df01c6e 100644
--- a/test/web/twitter_api/views/activity_view_test.exs
+++ b/test/web/twitter_api/views/activity_view_test.exs
@@ -82,7 +82,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
result = ActivityView.render("activity.json", activity: activity)
assert result["statusnet_html"] ==
- "<a class=\"hashtag\" data-tag=\"bike\" href=\"http://localhost:4001/tag/bike\">#Bike</a> log - Commute Tuesday<br /><a href=\"https://pla.bike/posts/20181211/\">https://pla.bike/posts/20181211/</a><br /><a class=\"hashtag\" data-tag=\"cycling\" href=\"http://localhost:4001/tag/cycling\">#cycling</a> <a class=\"hashtag\" data-tag=\"chscycling\" href=\"http://localhost:4001/tag/chscycling\">#CHScycling</a> <a class=\"hashtag\" data-tag=\"commute\" href=\"http://localhost:4001/tag/commute\">#commute</a><br />MVIMG_20181211_054020.jpg"
+ "<a class=\"hashtag\" data-tag=\"bike\" href=\"http://localhost:4001/tag/bike\" rel=\"tag\">#Bike</a> log - Commute Tuesday<br /><a href=\"https://pla.bike/posts/20181211/\">https://pla.bike/posts/20181211/</a><br /><a class=\"hashtag\" data-tag=\"cycling\" href=\"http://localhost:4001/tag/cycling\" rel=\"tag\">#cycling</a> <a class=\"hashtag\" data-tag=\"chscycling\" href=\"http://localhost:4001/tag/chscycling\" rel=\"tag\">#CHScycling</a> <a class=\"hashtag\" data-tag=\"commute\" href=\"http://localhost:4001/tag/commute\" rel=\"tag\">#commute</a><br />MVIMG_20181211_054020.jpg"
assert result["text"] ==
"#Bike log - Commute Tuesday\nhttps://pla.bike/posts/20181211/\n#cycling #CHScycling #commute\nMVIMG_20181211_054020.jpg"