diff options
| author | lain <lain@soykaf.club> | 2018-03-27 15:22:54 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-03-27 15:22:54 +0200 |
| commit | c6cd1a56f03193062edd257fe90048f4df39f20c (patch) | |
| tree | 7236e221a0b38f6b5b8de110079844731fe2ca2c /test | |
| parent | 20982ab4d0ebe9f2509dacf89682efeac30080c5 (diff) | |
| parent | 2e683b10d54030c045c570b6ce44b9b3291ae6e1 (diff) | |
| download | pleroma-c6cd1a56f03193062edd257fe90048f4df39f20c.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'test')
| -rw-r--r-- | test/formatter_test.exs | 2 | ||||
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/formatter_test.exs b/test/formatter_test.exs index 0e915d8d5..9ec2cc9f2 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -7,7 +7,7 @@ defmodule Pleroma.FormatterTest do describe ".add_hashtag_links" do test "turns hashtags into links" do text = "I love #cofe and #2hu" - expected_text = "I love #<a href='http://localhost:4001/tag/cofe' rel='tag'>cofe</a> and #<a href='http://localhost:4001/tag/2hu' rel='tag'>2hu</a>" + expected_text = "I love <a href='http://localhost:4001/tag/cofe' rel='tag'>#cofe</a> and <a href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a>" tags = Formatter.parse_tags(text) assert expected_text == Formatter.add_hashtag_links({[], text}, tags) |> Formatter.finalize diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 7d578a751..715a746ef 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) - expected_text = "Hello again, <span><a href='shp'>@<span>shp</span></a></span>.<script></script><br>This is on another :moominmamma: line. #<a href='http://localhost:4001/tag/2hu' rel='tag'>2hu</a> #<a href='http://localhost:4001/tag/epic' rel='tag'>epic</a> #<a href='http://localhost:4001/tag/phantasmagoric' rel='tag'>phantasmagoric</a><br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>" + expected_text = "Hello again, <span><a href='shp'>@<span>shp</span></a></span>.<script></script><br>This is on another :moominmamma: line. <a href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a> <a href='http://localhost:4001/tag/epic' rel='tag'>#epic</a> <a href='http://localhost:4001/tag/phantasmagoric' rel='tag'>#phantasmagoric</a><br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>" assert get_in(activity.data, ["object", "content"]) == expected_text assert get_in(activity.data, ["object", "type"]) == "Note" assert get_in(activity.data, ["object", "actor"]) == user.ap_id |