From f036674fffdb87e7842c3251be76d6beddc85f39 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Wed, 27 Jul 2022 22:18:25 +0100 Subject: [PATCH] fix tests --- .woodpecker.yml | 15 +++++++++++++++ lib/pleroma/user.ex | 5 +---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d728bbea8..be497b531 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -50,6 +50,21 @@ pipeline: - mix local.rebar --force - mix format --check-formatted + build: + image: akkoma/ci-base:latest + <<: *on-pr-open + environment: + MIX_ENV: test + POSTGRES_DB: pleroma_test + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + DB_HOST: postgres + commands: + - mix local.hex --force + - mix local.rebar --force + - mix deps.get + - mix compile + test: image: akkoma/ci-base:latest <<: *on-pr-open diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 077d5ffa6..2a1b5af94 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -663,8 +663,6 @@ defmodule Pleroma.User do # Used to auto-register LDAP accounts which won't have a password hash stored locally def register_changeset_ldap(struct, params = %{password: password}) when is_nil(password) do - params = Map.put_new(params, :accepts_chat_messages, true) - params = if Map.has_key?(params, :email) do Map.put_new(params, :email, params[:email]) @@ -676,8 +674,7 @@ defmodule Pleroma.User do |> cast(params, [ :name, :nickname, - :email, - :accepts_chat_messages + :email ]) |> validate_required([:name, :nickname]) |> unique_constraint(:nickname)