Initialize ejabberd_access_permissions in elixir tests

diff --git a/test/ejabberd_admin_test.exs b/test/ejabberd_admin_test.exs
index 1c999314cef692c81af0b242772def3476a1fb1b..31b8ab2e235c8414cc0fa326d452af1b38910ab2 100644 (file)
--- a/test/ejabberd_admin_test.exs
+++ b/test/ejabberd_admin_test.exs
@@ -28,6 +28,7 @@ defmodule EjabberdAdminTest do
                # For some myterious reason, :ejabberd_commands.init mays
                # sometimes fails if module is not loaded before
                {:module, :ejabberd_commands} = Code.ensure_loaded(:ejabberd_commands)
+               {:ok, _} = :ejabberd_access_permissions.start_link()
                :ejabberd_commands.init
                :ejabberd_admin.start
                :ok

diff --git a/test/ejabberd_commands_mock_test.exs b/test/ejabberd_commands_mock_test.exs
index 785e74cd785369da9fbf22fbd4ec8df9dd73f1e8..419a989d6e8086f6bce9bff274fffd7193b3e6a9 100644 (file)
--- a/test/ejabberd_commands_mock_test.exs
+++ b/test/ejabberd_commands_mock_test.exs
@@ -50,6 +50,7 @@ defmodule EjabberdCommandsMockTest do
                :mnesia.start
     :ok = :jid.start
     :ok = :ejabberd_config.start(["domain1", "domain2"], [])
+    {:ok, _} = :ejabberd_access_permissions.start_link()
     :ok = :acl.start
                EjabberdOauthMock.init
     on_exit fn -> :meck.unload end

diff --git a/test/ejabberd_commands_test.exs b/test/ejabberd_commands_test.exs
index 10b656140c84ae06fc18fdf854e61b053746f79d..c8219d0cf32e388721bea8a5ec34ac00627f9119 100644 (file)
--- a/test/ejabberd_commands_test.exs
+++ b/test/ejabberd_commands_test.exs
@@ -30,6 +30,7 @@ defmodule EjabberdCommandsTest do
     :mnesia.start
     :stringprep.start
     :ok = :ejabberd_config.start(["localhost"], [])
+    {:ok, _} = :ejabberd_access_permissions.start_link()
 
     :ejabberd_commands.init
     :ok

diff --git a/test/mod_admin_extra_test.exs b/test/mod_admin_extra_test.exs
index 03422264f5cfb36b5af59e705712526a40eb3bce..fde66f03f136be0386a89dc4f6399b08a26cfd40 100644 (file)
--- a/test/mod_admin_extra_test.exs
+++ b/test/mod_admin_extra_test.exs
@@ -45,6 +45,7 @@ defmodule EjabberdModAdminExtraTest do
                rescue
                        _ -> :ok
                end
+               {:ok, _} = :ejabberd_access_permissions.start_link()
                :ejabberd_commands.init
                 :ok = :ejabberd_config.start([@domain], [])
                :mod_admin_extra.start(@domain, [])

diff --git a/test/mod_http_api_mock_test.exs b/test/mod_http_api_mock_test.exs
index 9cba3536503f7cd8a48d501503a75244822d2b5e..4809ecd591be694f4483a2ba3257d095a403e65c 100644 (file)
--- a/test/mod_http_api_mock_test.exs
+++ b/test/mod_http_api_mock_test.exs
@@ -46,6 +46,7 @@ defmodule ModHttpApiMockTest do
       :mnesia.start
                        :stringprep.start
       :ejabberd_config.start([@domain], [])
+      {:ok, _} = :ejabberd_access_permissions.start_link()
       :ejabberd_commands.init
                rescue
                        _ -> :ok
@@ -240,10 +241,10 @@ defmodule ModHttpApiMockTest do
     result = :ejabberd_oauth.process([], req)
     assert 200 = elem(result, 0) #http code
     {kv} = :jiffy.decode(elem(result,2))
-    assert {_, "bearer"} = List.keyfind(kv, "token_type", 0) 
-    assert {_, @command} = List.keyfind(kv, "scope", 0) 
-    assert {_, 4000} = List.keyfind(kv, "expires_in", 0) 
-    {"access_token", _token} = List.keyfind(kv, "access_token", 0) 
+    assert {_, "bearer"} = List.keyfind(kv, "token_type", 0)
+    assert {_, @command} = List.keyfind(kv, "scope", 0)
+    assert {_, 4000} = List.keyfind(kv, "expires_in", 0)
+    {"access_token", _token} = List.keyfind(kv, "access_token", 0)
 
     #missing grant_type
     req = request(method: :POST,
@@ -254,7 +255,7 @@ defmodule ModHttpApiMockTest do
     result = :ejabberd_oauth.process([], req)
     assert 400 = elem(result, 0) #http code
     {kv} = :jiffy.decode(elem(result,2))
-    assert {_, "unsupported_grant_type"} = List.keyfind(kv, "error", 0) 
+    assert {_, "unsupported_grant_type"} = List.keyfind(kv, "error", 0)
 
 
                # incorrect user/pass
@@ -266,7 +267,7 @@ defmodule ModHttpApiMockTest do
     result = :ejabberd_oauth.process([], req)
     assert 400 = elem(result, 0) #http code
     {kv} = :jiffy.decode(elem(result,2))
-    assert {_, "invalid_grant"} = List.keyfind(kv, "error", 0) 
+    assert {_, "invalid_grant"} = List.keyfind(kv, "error", 0)
 
                assert :meck.validate :ejabberd_auth
                assert :meck.validate :ejabberd_commands

diff --git a/test/mod_http_api_test.exs b/test/mod_http_api_test.exs
index e2ae3d784abb80680d550be2dbd64ae1826d129d..efe090a3e37dc0d8881c0b5bc562b322895dab28 100644 (file)
--- a/test/mod_http_api_test.exs
+++ b/test/mod_http_api_test.exs
@@ -31,6 +31,7 @@ defmodule ModHttpApiTest do
     :ok = :mnesia.start
     :stringprep.start
     :ok = :ejabberd_config.start(["localhost"], [])
+    {:ok, _} = :ejabberd_access_permissions.start_link()
     :ok = :ejabberd_commands.init
     :ok = :ejabberd_commands.register_commands(cmds)
     on_exit fn ->