Update linkify migration tests to use config from ConfigDB

This commit is contained in:
Alex Gleason 2020-07-22 16:01:55 -05:00
parent c7a0016f9f
commit b6488a4db4
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
3 changed files with 19 additions and 10 deletions

View File

@ -10,6 +10,7 @@ defmodule Pleroma.FormatterTest do
import Pleroma.Factory import Pleroma.Factory
setup_all do setup_all do
clear_config(Pleroma.Formatter)
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok :ok
end end

View File

@ -1,9 +1,10 @@
defmodule Pleroma.Repo.Migrations.AutolinkerToLinkifyTest do defmodule Pleroma.Repo.Migrations.AutolinkerToLinkifyTest do
use Pleroma.DataCase use Pleroma.DataCase
import Pleroma.Factory import Pleroma.Factory
import Pleroma.Tests.Helpers, only: [require_migration: 1] import Pleroma.Tests.Helpers
alias Pleroma.ConfigDB alias Pleroma.ConfigDB
setup do: clear_config(Pleroma.Formatter)
setup_all do: require_migration("20200716195806_autolinker_to_linkify") setup_all do: require_migration("20200716195806_autolinker_to_linkify")
test "change/0 converts auto_linker opts for Pleroma.Formatter", %{migration: migration} do test "change/0 converts auto_linker opts for Pleroma.Formatter", %{migration: migration} do
@ -13,7 +14,7 @@ test "change/0 converts auto_linker opts for Pleroma.Formatter", %{migration: mi
class: false, class: false,
strip_prefix: false, strip_prefix: false,
new_window: false, new_window: false,
rel: "ugc" rel: "testing"
] ]
insert(:config, group: :auto_linker, key: :opts, value: autolinker_opts) insert(:config, group: :auto_linker, key: :opts, value: autolinker_opts)
@ -28,17 +29,20 @@ test "change/0 converts auto_linker opts for Pleroma.Formatter", %{migration: mi
class: false, class: false,
extra: true, extra: true,
new_window: false, new_window: false,
rel: "ugc", rel: "testing",
strip_prefix: false strip_prefix: false
] ]
Pleroma.Config.put(Pleroma.Formatter, new_opts)
assert new_opts == Pleroma.Config.get(Pleroma.Formatter)
{text, _mentions, []} = {text, _mentions, []} =
Pleroma.Formatter.linkify( Pleroma.Formatter.linkify(
"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\n\nOmg will COVID finally end Black Friday???" "https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\n\nOmg will COVID finally end Black Friday???"
) )
assert text == assert text ==
"<a href=\"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\" rel=\"ugc\">https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7</a>\n\nOmg will COVID finally end Black Friday???" "<a href=\"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\" rel=\"testing\">https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7</a>\n\nOmg will COVID finally end Black Friday???"
end end
test "transform_opts/1 returns a list of compatible opts", %{migration: migration} do test "transform_opts/1 returns a list of compatible opts", %{migration: migration} do
@ -48,14 +52,14 @@ test "transform_opts/1 returns a list of compatible opts", %{migration: migratio
class: false, class: false,
strip_prefix: false, strip_prefix: false,
new_window: false, new_window: false,
rel: "ugc" rel: "qqq"
] ]
expected_opts = [ expected_opts = [
class: false, class: false,
extra: true, extra: true,
new_window: false, new_window: false,
rel: "ugc", rel: "qqq",
strip_prefix: false strip_prefix: false
] ]

View File

@ -1,9 +1,10 @@
defmodule Pleroma.Repo.Migrations.FixMalformedFormatterConfigTest do defmodule Pleroma.Repo.Migrations.FixMalformedFormatterConfigTest do
use Pleroma.DataCase use Pleroma.DataCase
import Pleroma.Factory import Pleroma.Factory
import Pleroma.Tests.Helpers, only: [require_migration: 1] import Pleroma.Tests.Helpers
alias Pleroma.ConfigDB alias Pleroma.ConfigDB
setup do: clear_config(Pleroma.Formatter)
setup_all do: require_migration("20200722185515_fix_malformed_formatter_config") setup_all do: require_migration("20200722185515_fix_malformed_formatter_config")
test "change/0 converts a map into a list", %{migration: migration} do test "change/0 converts a map into a list", %{migration: migration} do
@ -11,7 +12,7 @@ test "change/0 converts a map into a list", %{migration: migration} do
class: false, class: false,
extra: true, extra: true,
new_window: false, new_window: false,
rel: "ugc", rel: "F",
strip_prefix: false strip_prefix: false
} }
@ -25,17 +26,20 @@ test "change/0 converts a map into a list", %{migration: migration} do
class: false, class: false,
extra: true, extra: true,
new_window: false, new_window: false,
rel: "ugc", rel: "F",
strip_prefix: false strip_prefix: false
] ]
Pleroma.Config.put(Pleroma.Formatter, new_opts)
assert new_opts == Pleroma.Config.get(Pleroma.Formatter)
{text, _mentions, []} = {text, _mentions, []} =
Pleroma.Formatter.linkify( Pleroma.Formatter.linkify(
"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\n\nOmg will COVID finally end Black Friday???" "https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\n\nOmg will COVID finally end Black Friday???"
) )
assert text == assert text ==
"<a href=\"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\" rel=\"ugc\">https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7</a>\n\nOmg will COVID finally end Black Friday???" "<a href=\"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\" rel=\"F\">https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7</a>\n\nOmg will COVID finally end Black Friday???"
end end
test "change/0 skips if Pleroma.Formatter config is already a list", %{migration: migration} do test "change/0 skips if Pleroma.Formatter config is already a list", %{migration: migration} do