diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-08-11 15:13:29 +0300 | 
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-08-11 15:13:29 +0300 | 
| commit | 2def3cbf417075146da5e54201e9b969e6aa3eca (patch) | |
| tree | 93cdf149a1874f56d2808598f8aeee15e60c8a10 /test/web/metadata | |
| parent | 56ddf20208657487bf0298409cf91b11dac346ff (diff) | |
| parent | 686002164a5ab63ccb22cff015faf87f8f7fc9ec (diff) | |
| download | pleroma-2def3cbf417075146da5e54201e9b969e6aa3eca.tar.gz pleroma-2def3cbf417075146da5e54201e9b969e6aa3eca.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
#	config/config.exs
#	mix.lock
Diffstat (limited to 'test/web/metadata')
| -rw-r--r-- | test/web/metadata/rel_me_test.exs | 5 | 
1 files changed, 2 insertions, 3 deletions
| diff --git a/test/web/metadata/rel_me_test.exs b/test/web/metadata/rel_me_test.exs index 4107a8459..2293d6e13 100644 --- a/test/web/metadata/rel_me_test.exs +++ b/test/web/metadata/rel_me_test.exs @@ -9,13 +9,12 @@ defmodule Pleroma.Web.Metadata.Providers.RelMeTest do    test "it renders all links with rel='me' from user bio" do      bio = -      ~s(<a href="https://some-link.com">https://some-link.com</a> <a rel="me" href="https://another-link.com">https://another-link.com</a> -    <link href="http://some.com"> <link rel="me" href="http://some3.com>") +      ~s(<a href="https://some-link.com">https://some-link.com</a> <a rel="me" href="https://another-link.com">https://another-link.com</a> <link href="http://some.com"> <link rel="me" href="http://some3.com">)      user = insert(:user, %{bio: bio})      assert RelMe.build_tags(%{user: user}) == [ -             {:link, [rel: "me", href: "http://some3.com>"], []}, +             {:link, [rel: "me", href: "http://some3.com"], []},               {:link, [rel: "me", href: "https://another-link.com"], []}             ]    end | 
