diff --git a/lib/pleroma/emoji/pack.ex b/lib/pleroma/emoji/pack.ex index 8b97c4cfe..fcfe96f1c 100644 --- a/lib/pleroma/emoji/pack.ex +++ b/lib/pleroma/emoji/pack.ex @@ -184,12 +184,9 @@ def update_file(%Pack{} = pack, shortcode, new_shortcode, new_filename, force) d @spec import_from_filesystem() :: {:ok, [String.t()]} | {:error, File.posix() | atom()} def import_from_filesystem do emoji_path = emoji_path() - IO.inspect(emoji_path) with {:ok, %{access: :read_write}} <- File.stat(emoji_path), {:ok, results} <- File.ls(emoji_path) do - IO.inspect(results) - names = results |> Enum.map(&Path.join(emoji_path, &1)) diff --git a/lib/pleroma/web/plugs/o_auth_scopes_plug.ex b/lib/pleroma/web/plugs/o_auth_scopes_plug.ex index e4d098a7d..f017c8bc7 100644 --- a/lib/pleroma/web/plugs/o_auth_scopes_plug.ex +++ b/lib/pleroma/web/plugs/o_auth_scopes_plug.ex @@ -34,9 +34,7 @@ def perform(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do permissions = Enum.join(missing_scopes, " #{op} ") error_message = - dgettext("errors", "Insufficient permissions: %{permissions}.", - permissions: permissions - ) + dgettext("errors", "Insufficient permissions: %{permissions}.", permissions: permissions) conn |> put_resp_content_type("application/json") diff --git a/test/mix/tasks/pleroma/app_test.exs b/test/mix/tasks/pleroma/app_test.exs index 9eabd32af..7eb4c4352 100644 --- a/test/mix/tasks/pleroma/app_test.exs +++ b/test/mix/tasks/pleroma/app_test.exs @@ -50,13 +50,13 @@ test "with errors" do defp assert_app(name, redirect, scopes) do app = Repo.get_by(Pleroma.Web.OAuth.App, client_name: name) - assert_receive {:mix_shell, :info, [message]} + assert_receive {:mix_shell, :info, [message]}, 1_000 assert message == "#{name} successfully created:" - assert_receive {:mix_shell, :info, [message]} + assert_receive {:mix_shell, :info, [message]}, 1_000 assert message == "App client_id: #{app.client_id}" - assert_receive {:mix_shell, :info, [message]} + assert_receive {:mix_shell, :info, [message]}, 1_000 assert message == "App client_secret: #{app.client_secret}" assert app.scopes == scopes