pleroma

commit: b3ee618e0d726452248c6fa9a1830d2525b9693b
parent 6adad96c79fdcaf56c2f42cba248612a29ebb1ff
Author: feld <feld@feld.me>
Date:   Fri,  4 Dec 2020 18:17:35 +0000

Merge branch 'fix/mix-task-yn-prompt' into 'develop'

Remove Mix.Pleroma.shell_yes?/1

See merge request pleroma/pleroma!3179
Diffstat:
M
lib/mix/pleroma.ex
6
------
M
lib/mix/tasks/pleroma/user.ex
2
+-
M
test/mix/tasks/pleroma/user_test.exs
8
++++----

3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
@@ -98,12 +98,6 @@ defmodule Mix.Pleroma do
     end
   end
 
-  def shell_yes?(message) do
-    if mix_shell?(),
-      do: Mix.shell().yes?("Continue?"),
-      else: shell_prompt(message, "Continue?") in ~w(Yn Y y)
-  end
-
   def shell_info(message) do
     if mix_shell?(),
       do: Mix.shell().info(message),
diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
@@ -60,7 +60,7 @@ defmodule Mix.Tasks.Pleroma.User do
       - admin: #{if(admin?, do: "true", else: "false")}
     """)
 
-    proceed? = assume_yes? or shell_yes?("Continue?")
+    proceed? = assume_yes? or shell_prompt("Continue?", "n") in ~w(Yn Y y)
 
     if proceed? do
       start_pleroma()
diff --git a/test/mix/tasks/pleroma/user_test.exs b/test/mix/tasks/pleroma/user_test.exs
@@ -36,7 +36,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
       unsaved = build(:user)
 
       # prepare to answer yes
-      send(self(), {:mix_shell_input, :yes?, true})
+      send(self(), {:mix_shell_input, :prompt, "Y"})
 
       Mix.Tasks.Pleroma.User.run([
         "new",
@@ -55,7 +55,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
       assert_received {:mix_shell, :info, [message]}
       assert message =~ "user will be created"
 
-      assert_received {:mix_shell, :yes?, [message]}
+      assert_received {:mix_shell, :prompt, [message]}
       assert message =~ "Continue"
 
       assert_received {:mix_shell, :info, [message]}
@@ -73,14 +73,14 @@ defmodule Mix.Tasks.Pleroma.UserTest do
       unsaved = build(:user)
 
       # prepare to answer no
-      send(self(), {:mix_shell_input, :yes?, false})
+      send(self(), {:mix_shell_input, :prompt, "N"})
 
       Mix.Tasks.Pleroma.User.run(["new", unsaved.nickname, unsaved.email])
 
       assert_received {:mix_shell, :info, [message]}
       assert message =~ "user will be created"
 
-      assert_received {:mix_shell, :yes?, [message]}
+      assert_received {:mix_shell, :prompt, [message]}
       assert message =~ "Continue"
 
       assert_received {:mix_shell, :info, [message]}