summaryrefslogtreecommitdiff
path: root/test/html_test.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-10-08 17:24:09 -0500
committerAlex Gleason <alex@alexgleason.me>2020-10-08 17:24:09 -0500
commit3f9263fb16ad519d2dd45106549a8ba42b68fc1f (patch)
treea48eb564f7f037a876a4d2131f8571aa33702b22 /test/html_test.exs
parent24ce9c011caf7401fb261c7df4196b2ef9ba3d90 (diff)
parent74be4de3f6c2c34447029649526637411acfa9f3 (diff)
downloadpleroma-3f9263fb16ad519d2dd45106549a8ba42b68fc1f.tar.gz
pleroma-3f9263fb16ad519d2dd45106549a8ba42b68fc1f.zip
Merge remote-tracking branch 'upstream/develop' into restrict-origin
Diffstat (limited to 'test/html_test.exs')
-rw-r--r--test/html_test.exs14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/html_test.exs b/test/html_test.exs
index f8907c8b4..7d3756884 100644
--- a/test/html_test.exs
+++ b/test/html_test.exs
@@ -165,7 +165,7 @@ defmodule Pleroma.HTMLTest do
end
end
- describe "extract_first_external_url" do
+ describe "extract_first_external_url_from_object" do
test "extracts the url" do
user = insert(:user)
@@ -176,7 +176,7 @@ defmodule Pleroma.HTMLTest do
})
object = Object.normalize(activity)
- {:ok, url} = HTML.extract_first_external_url(object, object.data["content"])
+ {:ok, url} = HTML.extract_first_external_url_from_object(object)
assert url == "https://github.com/komeiji-satori/Dress"
end
@@ -191,7 +191,7 @@ defmodule Pleroma.HTMLTest do
})
object = Object.normalize(activity)
- {:ok, url} = HTML.extract_first_external_url(object, object.data["content"])
+ {:ok, url} = HTML.extract_first_external_url_from_object(object)
assert url == "https://github.com/syuilo/misskey/blob/develop/docs/setup.en.md"
@@ -207,7 +207,7 @@ defmodule Pleroma.HTMLTest do
})
object = Object.normalize(activity)
- {:ok, url} = HTML.extract_first_external_url(object, object.data["content"])
+ {:ok, url} = HTML.extract_first_external_url_from_object(object)
assert url == "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=72255140"
end
@@ -223,7 +223,7 @@ defmodule Pleroma.HTMLTest do
})
object = Object.normalize(activity)
- {:ok, url} = HTML.extract_first_external_url(object, object.data["content"])
+ {:ok, url} = HTML.extract_first_external_url_from_object(object)
assert url == "https://www.pixiv.net/member_illust.php?mode=medium&illust_id=72255140"
end
@@ -235,7 +235,7 @@ defmodule Pleroma.HTMLTest do
object = Object.normalize(activity)
- assert {:ok, nil} = HTML.extract_first_external_url(object, object.data["content"])
+ assert {:ok, nil} = HTML.extract_first_external_url_from_object(object)
end
test "skips attachment links" do
@@ -249,7 +249,7 @@ defmodule Pleroma.HTMLTest do
object = Object.normalize(activity)
- assert {:ok, nil} = HTML.extract_first_external_url(object, object.data["content"])
+ assert {:ok, nil} = HTML.extract_first_external_url_from_object(object)
end
end
end