From 40c58d3383001a63a787f1e0956aeaad902afb64 Mon Sep 17 00:00:00 2001 From: link0ff Date: Wed, 20 Mar 2019 13:28:06 +0200 Subject: [PATCH 1/2] Ignore compilation warnings for undefined module :eldap --- mix.exs | 1 + 1 file changed, 1 insertion(+) diff --git a/mix.exs b/mix.exs index efdf15d3a..352620e63 100644 --- a/mix.exs +++ b/mix.exs @@ -9,6 +9,7 @@ def project do elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), elixirc_options: [warnings_as_errors: true], + xref: [exclude: [:eldap]], start_permanent: Mix.env() == :prod, aliases: aliases(), deps: deps(), From f858df819bf619bada7468f48b945cfab7f52ad0 Mon Sep 17 00:00:00 2001 From: link0ff Date: Thu, 21 Mar 2019 12:31:16 +0200 Subject: [PATCH 2/2] Skip tests in LDAPAuthorizationTest if :eldap module is unavailable --- test/web/oauth/ldap_authorization_test.exs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/web/oauth/ldap_authorization_test.exs b/test/web/oauth/ldap_authorization_test.exs index 5bf7eb93c..0eb191c76 100644 --- a/test/web/oauth/ldap_authorization_test.exs +++ b/test/web/oauth/ldap_authorization_test.exs @@ -10,6 +10,8 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do import ExUnit.CaptureLog import Mock + @skip if !Code.ensure_loaded?(:eldap), do: :skip + setup_all do ldap_authenticator = Pleroma.Config.get(Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator) @@ -27,6 +29,7 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do :ok end + @tag @skip test "authorizes the existing user using LDAP credentials" do password = "testpassword" user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password)) @@ -65,6 +68,7 @@ test "authorizes the existing user using LDAP credentials" do end end + @tag @skip test "creates a new user after successful LDAP authorization" do password = "testpassword" user = build(:user) @@ -110,6 +114,7 @@ test "creates a new user after successful LDAP authorization" do end end + @tag @skip test "falls back to the default authorization when LDAP is unavailable" do password = "testpassword" user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password)) @@ -153,6 +158,7 @@ test "falls back to the default authorization when LDAP is unavailable" do end end + @tag @skip test "disallow authorization for wrong LDAP credentials" do password = "testpassword" user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password))