diff options
author | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
commit | c9b418e5477229017b3750c55cf3ea3d03b7e609 (patch) | |
tree | d1b458bea76ff3ec296897de405f9e3c8578f897 /test/formatter_test.exs | |
parent | 44693fbf6e5c5ec5622207e263688e3af7d1a83a (diff) | |
parent | 4df71cd88b2725f1838c2899b3078a74dbb0c33f (diff) | |
download | pleroma-c9b418e5477229017b3750c55cf3ea3d03b7e609.tar.gz pleroma-c9b418e5477229017b3750c55cf3ea3d03b7e609.zip |
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
Diffstat (limited to 'test/formatter_test.exs')
-rw-r--r-- | test/formatter_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/formatter_test.exs b/test/formatter_test.exs index bd8844458..2e717194b 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -124,7 +124,7 @@ defmodule Pleroma.FormatterTest do end describe "add_user_links" do - test "gives a replacement for user links" do + test "gives a replacement for user links, using local nicknames in user links text" do text = "@gsimg According to @archa_eme_, that is @daggsy. Also hello @archaeme@archae.me" gsimg = insert(:user, %{nickname: "gsimg"}) |