summaryrefslogtreecommitdiff
path: root/test/mod_admin_extra_test.exs
diff options
context:
space:
mode:
authorMickael Remond <mremond@process-one.net>2016-03-31 22:01:57 +0200
committerMickael Remond <mremond@process-one.net>2016-03-31 22:01:57 +0200
commit97d345d2877dcac10f81642d8ba09a39a4e787f8 (patch)
tree7f6ead7012edc436d46a86d9f4bb3b0e883b25c4 /test/mod_admin_extra_test.exs
parentFix failing tests (diff)
Port mod_admin_extra test to work with new API
Diffstat (limited to 'test/mod_admin_extra_test.exs')
-rw-r--r--test/mod_admin_extra_test.exs18
1 files changed, 10 insertions, 8 deletions
diff --git a/test/mod_admin_extra_test.exs b/test/mod_admin_extra_test.exs
index 7fa39eef..d90aa045 100644
--- a/test/mod_admin_extra_test.exs
+++ b/test/mod_admin_extra_test.exs
@@ -21,6 +21,8 @@
defmodule EjabberdModAdminExtraTest do
use ExUnit.Case, async: false
+ require EjabberdAuthMock
+
@author "jsautret@process-one.net"
@user "user"
@@ -29,11 +31,11 @@ defmodule EjabberdModAdminExtraTest do
@resource "resource"
require Record
- Record.defrecord :jid, Record.extract(:jid,
- from: "jlib.hrl")
+ Record.defrecord :jid, Record.extract(:jid, from_lib: "ejabberd/include/jlib.hrl")
setup_all do
try do
+ :jid.start
:stringprep.start
:mnesia.start
:p1_sha.load_nif
@@ -71,13 +73,13 @@ defmodule EjabberdModAdminExtraTest do
EjabberdAuthMock.create_user @user, @domain, @password
assert :ejabberd_commands.execute_command(:check_password,
- [@user, @domain, @password])
+ [@user, <<"">>, @domain, @password])
refute :ejabberd_commands.execute_command(:check_password,
- [@user, @domain, "bad_password"])
+ [@user, <<"">>, @domain, "bad_password"])
refute :ejabberd_commands.execute_command(:check_password,
- [@user, "bad_domain", @password])
+ [@user, <<"">>, "bad_domain", @password])
refute :ejabberd_commands.execute_command(:check_password,
- ["bad_user", @domain, @password])
+ ["bad_user", <<"">>, @domain, @password])
assert :meck.validate :ejabberd_auth
@@ -115,9 +117,9 @@ defmodule EjabberdModAdminExtraTest do
assert :ejabberd_commands.execute_command(:change_password,
[@user, @domain, "new_password"])
refute :ejabberd_commands.execute_command(:check_password,
- [@user, @domain, @password])
+ [@user, <<"">>, @domain, @password])
assert :ejabberd_commands.execute_command(:check_password,
- [@user, @domain, "new_password"])
+ [@user, <<"">>, @domain, "new_password"])
assert {:not_found, 'unknown_user'} ==
catch_throw :ejabberd_commands.execute_command(:change_password,
["bad_user", @domain,