diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-13 15:13:24 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-13 15:13:24 +0000 |
| commit | b19ee62252114d024b52aff3ebb01ac16244990c (patch) | |
| tree | e78c217696a86d8c2e79eb297558016fa37686a4 /test | |
| parent | a5a10988e87dfb7bc4bedf6c9cb3f52e739286d7 (diff) | |
| parent | 7214d574630842e4efb76d6c3494a180cbc2a930 (diff) | |
| download | pleroma-b19ee62252114d024b52aff3ebb01ac16244990c.tar.gz | |
Merge branch 'username-underscores' into 'develop'
Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537
Diffstat (limited to 'test')
| -rw-r--r-- | test/formatter_test.exs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/formatter_test.exs b/test/formatter_test.exs index abb9d882c..428227d78 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -109,13 +109,13 @@ defmodule Pleroma.FormatterTest do describe "add_user_links" do test "gives a replacement for user links" do - text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me" + text = "@gsimg According to @archa_eme_, that is @daggsy. Also hello @archaeme@archae.me" gsimg = insert(:user, %{nickname: "gsimg"}) archaeme = insert(:user, %{ - nickname: "archaeme", - info: %Pleroma.User.Info{source_data: %{"url" => "https://archeme/@archaeme"}} + nickname: "archa_eme_", + info: %Pleroma.User.Info{source_data: %{"url" => "https://archeme/@archa_eme_"}} }) archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"}) @@ -130,7 +130,7 @@ defmodule Pleroma.FormatterTest do expected_text = "<span><a data-user='#{gsimg.id}' class='mention' href='#{gsimg.ap_id}'>@<span>gsimg</span></a></span> According to <span><a data-user='#{ archaeme.id - }' class='mention' href='#{"https://archeme/@archaeme"}'>@<span>archaeme</span></a></span>, that is @daggsy. Also hello <span><a data-user='#{ + }' class='mention' href='#{"https://archeme/@archa_eme_"}'>@<span>archa_eme_</span></a></span>, that is @daggsy. Also hello <span><a data-user='#{ archaeme_remote.id }' class='mention' href='#{archaeme_remote.ap_id}'>@<span>archaeme</span></a></span>" |