From 695d22ef95f4b366b0b66123d37dee6674ee79db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
Date: Wed, 5 Oct 2016 13:54:29 +0200
Subject: [PATCH] Initialize ejabberd_access_permissions in elixir tests

---
 test/ejabberd_admin_test.exs         |  1 +
 test/ejabberd_commands_mock_test.exs |  1 +
 test/ejabberd_commands_test.exs      |  1 +
 test/mod_admin_extra_test.exs        |  1 +
 test/mod_http_api_mock_test.exs      | 13 +++++++------
 test/mod_http_api_test.exs           |  1 +
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/test/ejabberd_admin_test.exs b/test/ejabberd_admin_test.exs
index 1c999314c..31b8ab2e2 100644
--- 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 785e74cd7..419a989d6 100644
--- 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 10b656140..c8219d0cf 100644
--- 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 03422264f..fde66f03f 100644
--- 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 9cba35365..4809ecd59 100644
--- 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 e2ae3d784..efe090a3e 100644
--- 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 ->