projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix deletion regression due to strings instead of atoms
[akkoma]
/
test
/
support
/
helpers.ex
diff --git
a/test/support/helpers.ex
b/test/support/helpers.ex
index 26281b45e74dd5a9d5bba84321b755d590a70bf9..224034521e683e135f7a354711f43aa23352109d 100644
(file)
--- a/
test/support/helpers.ex
+++ b/
test/support/helpers.ex
@@
-17,9
+17,19
@@
defmodule Pleroma.Tests.Helpers do
defmacro clear_config(config_path, do: yield) do
quote do
defmacro clear_config(config_path, do: yield) do
quote do
- initial_setting = Config.
get
(unquote(config_path))
+ initial_setting = Config.
fetch
(unquote(config_path))
unquote(yield)
unquote(yield)
- on_exit(fn -> Config.put(unquote(config_path), initial_setting) end)
+
+ on_exit(fn ->
+ case initial_setting do
+ :error ->
+ Config.delete(unquote(config_path))
+
+ {:ok, value} ->
+ Config.put(unquote(config_path), value)
+ end
+ end)
+
:ok
end
end
:ok
end
end
@@
-32,6
+42,11
@@
defmodule Pleroma.Tests.Helpers do
end
end
end
end
+ def require_migration(migration_name) do
+ [{module, _}] = Code.require_file("#{migration_name}.exs", "priv/repo/migrations")
+ {:ok, %{migration: module}}
+ end
+
defmacro __using__(_opts) do
quote do
import Pleroma.Tests.Helpers,
defmacro __using__(_opts) do
quote do
import Pleroma.Tests.Helpers,
@@
-70,8
+85,8
@@
defmodule Pleroma.Tests.Helpers do
assigns = Map.new(assigns)
view.render(template, assigns)
assigns = Map.new(assigns)
view.render(template, assigns)
- |>
Poi
son.encode!()
- |>
Poi
son.decode!()
+ |>
Ja
son.encode!()
+ |>
Ja
son.decode!()
end
def stringify_keys(nil), do: nil
end
def stringify_keys(nil), do: nil