aboutsummaryrefslogtreecommitdiff
path: root/lib/mix/tasks
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-17 19:37:05 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-17 19:37:05 +0000
commit98c31deaa960392184da4f34ddc9e3eecbce3f4c (patch)
tree7b16fbf6a3773e46d6a022f98cb183ac65135df0 /lib/mix/tasks
parent078b8b6d228bee28697fda4bbefe65736f8b0d3c (diff)
parent22d483d4f74ff404fd6ae0cd88d2e5bcc7cceaf6 (diff)
downloadpleroma-98c31deaa960392184da4f34ddc9e3eecbce3f4c.tar.gz
Merge branch 'test-mix-tasks' into 'develop'
Add tests for Mix tasks See merge request pleroma/pleroma!555
Diffstat (limited to 'lib/mix/tasks')
-rw-r--r--lib/mix/tasks/pleroma/sample_psql.eex6
-rw-r--r--lib/mix/tasks/pleroma/user.ex18
2 files changed, 11 insertions, 13 deletions
diff --git a/lib/mix/tasks/pleroma/sample_psql.eex b/lib/mix/tasks/pleroma/sample_psql.eex
index c89b34ef2..f0ac05e57 100644
--- a/lib/mix/tasks/pleroma/sample_psql.eex
+++ b/lib/mix/tasks/pleroma/sample_psql.eex
@@ -1,6 +1,6 @@
-CREATE USER pleroma WITH ENCRYPTED PASSWORD '<%= dbpass %>';
-CREATE DATABASE pleroma_dev OWNER pleroma;
-\c pleroma_dev;
+CREATE USER <%= dbuser %> WITH ENCRYPTED PASSWORD '<%= dbpass %>';
+CREATE DATABASE <%= dbname %> OWNER <%= dbuser %>;
+\c <%= dbname %>;
--Extensions made by ecto.migrate that need superuser access
CREATE EXTENSION IF NOT EXISTS citext;
CREATE EXTENSION IF NOT EXISTS pg_trgm;
diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index fe6e6935f..3d30e3a81 100644
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -94,16 +94,14 @@ defmodule Mix.Tasks.Pleroma.User do
unless not proceed? do
Common.start_pleroma()
- params =
- %{
- nickname: nickname,
- email: email,
- password: password,
- password_confirmation: password,
- name: name,
- bio: bio
- }
- |> IO.inspect()
+ params = %{
+ nickname: nickname,
+ email: email,
+ password: password,
+ password_confirmation: password,
+ name: name,
+ bio: bio
+ }
user = User.register_changeset(%User{}, params)
Repo.insert!(user)