pleroma

commit: 8533b63d1f75cad58560431aa762ce817f16d77c
parent 0fceeb44b3797e2a3c5100edbfd6fdb9e2bf7f28
Author: rinpatch <rinpatch@sdf.org>
Date:   Fri, 24 Jan 2020 11:33:02 +0000

Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'

Fix for non existing atom

Closes #1532

See merge request pleroma/pleroma!2139
Diffstat:
M
lib/pleroma/config/config_db.ex
10
+---------
M
test/config/transfer_task_test.exs
13
-------------

2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/lib/pleroma/config/config_db.ex b/lib/pleroma/config/config_db.ex
@@ -236,15 +236,7 @@ defmodule Pleroma.ConfigDB do
   end
 
   @spec from_string(String.t()) :: atom() | no_return()
-  def from_string(":" <> entity), do: String.to_existing_atom(entity)
-
-  def from_string(entity) when is_binary(entity) do
-    if is_module_name?(entity) do
-      String.to_existing_atom("Elixir.#{entity}")
-    else
-      entity
-    end
-  end
+  def from_string(string), do: do_transform_string(string)
 
   @spec convert(any()) :: any()
   def convert(entity), do: do_convert(entity)
diff --git a/test/config/transfer_task_test.exs b/test/config/transfer_task_test.exs
@@ -105,17 +105,4 @@ defmodule Pleroma.Config.TransferTaskTest do
       Application.put_env(:pleroma, :assets, assets)
     end)
   end
-
-  test "non existing atom" do
-    ConfigDB.create(%{
-      group: ":pleroma",
-      key: ":undefined_atom_key",
-      value: [live: 2, com: 3]
-    })
-
-    assert ExUnit.CaptureLog.capture_log(fn ->
-             TransferTask.start_link([])
-           end) =~
-             "updating env causes error, group: \":pleroma\" key: \":undefined_atom_key\" value: [live: 2, com: 3] error: %ArgumentError{message: \"argument error\"}"
-  end
 end