Add ability to run test with Elixir mix

9 files changed, 63 insertions, 22 deletions

diff --git a/mix.exs b/mix.exs
index 03ce64da2..7453ea473 100644
--- a/mix.exs
+++ b/mix.exs
@@ -11,6 +11,8 @@ defmodule Ejabberd.Mixfile do
      compilers: [:asn1] ++ Mix.compilers,
      erlc_options: erlc_options,
      erlc_paths: ["asn1", "src"],
+     # Elixir tests are starting the part of ejabberd they need
+     aliases: [test: "test --no-start"],
      package: package,
      deps: deps]
   end
@@ -59,7 +61,9 @@ defmodule Ejabberd.Mixfile do
      {:exrm, "~> 1.0.0", only: :dev},
      # relx is used by exrm. Lock version as for now, ejabberd doesn not compile fine with
      # version 3.20:
-     {:relx, "~> 3.19.0", only: :dev}]
+     {:relx, "~> 3.19.0", only: :dev},
+     {:meck, "~> 0.8.4", only: :test},
+     {:moka, github: "processone/moka", tag: "1.0.5b", only: :test}]
   end
 
   defp package do
diff --git a/mix.lock b/mix.lock
index eda31f4a9..467f142ba 100644
--- a/mix.lock
+++ b/mix.lock
@@ -3,7 +3,7 @@
   "cf": {:hex, :cf, "0.2.1", "69d0b1349fd4d7d4dc55b7f407d29d7a840bf9a1ef5af529f1ebe0ce153fc2ab", [:rebar3], []},
   "eredis": {:hex, :eredis, "1.0.8", "ab4fda1c4ba7fbe6c19c26c249dc13da916d762502c4b4fa2df401a8d51c5364", [:rebar], []},
   "erlware_commons": {:hex, :erlware_commons, "0.19.0", "7b43caf2c91950c5f60dc20451e3c3afba44d3d4f7f27bcdc52469285a5a3e70", [:rebar3], [{:cf, "0.2.1", [hex: :cf, optional: false]}]},
-  "esip": {:hex, :esip, "1.0.7", "f75f6a5cac6814e506f0ff96141fbe276dee3261fca1471c8edfdde25b74f877", [:rebar3], [{:stun, "1.0.6", [hex: :stun, optional: false]}, {:p1_utils, "1.0.4", [hex: :p1_utils, optional: false]}, {:fast_tls, "1.0.6", [hex: :fast_tls, optional: false]}]},
+  "esip": {:hex, :esip, "1.0.7", "f75f6a5cac6814e506f0ff96141fbe276dee3261fca1471c8edfdde25b74f877", [:rebar3], [{:fast_tls, "1.0.6", [hex: :fast_tls, optional: false]}, {:p1_utils, "1.0.4", [hex: :p1_utils, optional: false]}, {:stun, "1.0.6", [hex: :stun, optional: false]}]},
   "exrm": {:hex, :exrm, "1.0.8", "5aa8990cdfe300282828b02cefdc339e235f7916388ce99f9a1f926a9271a45d", [:mix], [{:relx, "~> 3.5", [hex: :relx, optional: false]}]},
   "ezlib": {:hex, :ezlib, "1.0.1", "add8b2770a1a70c174aaea082b4a8668c0c7fdb03ee6cc81c6c68d3a6c3d767d", [:rebar3], []},
   "fast_tls": {:hex, :fast_tls, "1.0.6", "750a74aabb05056f0f222910f0955883649e6c5d67df6ca504ff676160d22b89", [:rebar3], [{:p1_utils, "1.0.4", [hex: :p1_utils, optional: false]}]},
@@ -14,13 +14,16 @@
   "iconv": {:hex, :iconv, "1.0.1", "dbb8700070577e7a021a095cc5ead221069a0c4034bfadca2516c1f1109ee7fd", [:rebar3], [{:p1_utils, "1.0.4", [hex: :p1_utils, optional: false]}]},
   "jiffy": {:hex, :jiffy, "0.14.7", "9f33b893edd6041ceae03bc1e50b412e858cc80b46f3d7535a7a9940a79a1c37", [:rebar, :make], []},
   "lager": {:hex, :lager, "3.0.2", "25dc81bc3659b62f5ab9bd073e97ddd894fc4c242019fccef96f3889d7366c97", [:rebar3], [{:goldrush, "0.1.7", [hex: :goldrush, optional: false]}]},
+  "meck": {:hex, :meck, "0.8.4", "59ca1cd971372aa223138efcf9b29475bde299e1953046a0c727184790ab1520", [:rebar, :make], []},
+  "moka": {:git, "https://github.com/processone/moka.git", "768efea96443c57125e6247dbebee687f17be149", [tag: "1.0.5b"]},
   "p1_mysql": {:hex, :p1_mysql, "1.0.1", "d2be1cfc71bb4f1391090b62b74c3f5cb8e7a45b0076b8cb290cd6b2856c581b", [:rebar3], []},
   "p1_oauth2": {:hex, :p1_oauth2, "0.6.1", "4e021250cc198c538b097393671a41e7cebf463c248980320e038fe0316eb56b", [:rebar3], []},
   "p1_pgsql": {:hex, :p1_pgsql, "1.1.0", "ca525c42878eac095e5feb19563acc9915c845648f48fdec7ba6266c625d4ac7", [:rebar3], []},
   "p1_utils": {:hex, :p1_utils, "1.0.4", "7face65db102b5d1ebe7ad3c7517c5ee8cfbe174c6658e3affbb00eb66e06787", [:rebar3], []},
   "p1_xmlrpc": {:hex, :p1_xmlrpc, "1.15.1", "a382b62dc21bb372281c2488f99294d84f2b4020ed0908a1c4ad710ace3cf35a", [:rebar3], []},
   "providers": {:hex, :providers, "1.6.0", "db0e2f9043ae60c0155205fcd238d68516331d0e5146155e33d1e79dc452964a", [:rebar3], [{:getopt, "0.8.2", [hex: :getopt, optional: false]}]},
-  "relx": {:hex, :relx, "3.19.0", "286dd5244b4786f56aac75d5c8e2d1fb4cfd306810d4ec8548f3ae1b3aadb8f7", [:rebar3], [{:providers, "1.6.0", [hex: :providers, optional: false]}, {:getopt, "0.8.2", [hex: :getopt, optional: false]}, {:erlware_commons, "0.19.0", [hex: :erlware_commons, optional: false]}, {:cf, "0.2.1", [hex: :cf, optional: false]}, {:bbmustache, "1.0.4", [hex: :bbmustache, optional: false]}]},
+  "relx": {:hex, :relx, "3.19.0", "286dd5244b4786f56aac75d5c8e2d1fb4cfd306810d4ec8548f3ae1b3aadb8f7", [:rebar3], [{:bbmustache, "1.0.4", [hex: :bbmustache, optional: false]}, {:cf, "0.2.1", [hex: :cf, optional: false]}, {:erlware_commons, "0.19.0", [hex: :erlware_commons, optional: false]}, {:getopt, "0.8.2", [hex: :getopt, optional: false]}, {:providers, "1.6.0", [hex: :providers, optional: false]}]},
+  "samerlib": {:git, "https://github.com/processone/samerlib", "9158f65d18ec63f8b409543b6fb46dd5fce46160", [tag: "0.8.0b"]},
   "sqlite3": {:hex, :sqlite3, "1.1.5", "794738b6d07b6d36ec6d42492cb9d629bad9cf3761617b8b8d728e765db19840", [:rebar3], []},
   "stringprep": {:hex, :stringprep, "1.0.5", "f29395275c35af5051b29bf875b44ac632dc4d0287880f0e143b536c61fd0ed5", [:rebar3], [{:p1_utils, "1.0.4", [hex: :p1_utils, optional: false]}]},
-  "stun": {:hex, :stun, "1.0.6", "1ca9dea574e09f60971bd8de9cb7e34f327cbf435462cf56aa30f05c1ee2f231", [:rebar3], [{:p1_utils, "1.0.4", [hex: :p1_utils, optional: false]}, {:fast_tls, "1.0.6", [hex: :fast_tls, optional: false]}]}}
+  "stun": {:hex, :stun, "1.0.6", "1ca9dea574e09f60971bd8de9cb7e34f327cbf435462cf56aa30f05c1ee2f231", [:rebar3], [{:fast_tls, "1.0.6", [hex: :fast_tls, optional: false]}, {:p1_utils, "1.0.4", [hex: :p1_utils, optional: false]}]}}
diff --git a/test/ejabberd_commands_mock_test.exs b/test/ejabberd_commands_mock_test.exs
index 72e7c2d3a..439a3c1d3 100644
--- a/test/ejabberd_commands_mock_test.exs
+++ b/test/ejabberd_commands_mock_test.exs
@@ -23,6 +23,8 @@
 defmodule EjabberdCommandsMockTest do
 	use ExUnit.Case, async: false
 
+  require EjabberdOauthMock
+
 	@author "jsautret@process-one.net"
 
 	# mocked callback module
@@ -50,7 +52,7 @@ defmodule EjabberdCommandsMockTest do
     :ok = :ejabberd_config.start(["domain1", "domain2"], [])
     :ok = :acl.start
 		EjabberdOauthMock.init
-		:ok
+    on_exit fn -> :meck.unload end
 	end
 
 	setup do
diff --git a/test/ejabberd_commands_test.exs b/test/ejabberd_commands_test.exs
index 31d108214..10b656140 100644
--- a/test/ejabberd_commands_test.exs
+++ b/test/ejabberd_commands_test.exs
@@ -28,7 +28,11 @@ defmodule EjabberdCommandsTest do
 
   setup_all do
     :mnesia.start
+    :stringprep.start
+    :ok = :ejabberd_config.start(["localhost"], [])
+
     :ejabberd_commands.init
+    :ok
   end
 
   test "Check that we can register a command" do
@@ -37,6 +41,14 @@ defmodule EjabberdCommandsTest do
     assert Enum.member?(commands, {:test_user, [], "Test user"})
   end
 
+  test "get_exposed_commands/0 returns registered commands" do
+    commands = [open_test_command]
+    :ok = :ejabberd_commands.register_commands(commands)
+    :ok = :ejabberd_commands.expose_commands(commands)
+    exposed_commands = :ejabberd_commands.get_exposed_commands
+    assert Enum.member?(exposed_commands, :test_open)
+  end
+
   test "Check that admin commands are rejected with noauth credentials" do
     :ok = :ejabberd_commands.register_commands([admin_test_command])
 
@@ -70,6 +82,16 @@ defmodule EjabberdCommandsTest do
                                                                ]}}}})
   end
 
+  defp open_test_command do
+    ejabberd_commands(name: :test_open, tags: [:test],
+                      desc: "Test open",
+                      policy: :open,
+                      module: __MODULE__,
+                      function: :test_open,
+                      args: [],
+                      result: {:res, :rescode})
+  end
+
   defp admin_test_command do
     ejabberd_commands(name: :test_admin, tags: [:roster],
                       desc: "Test admin",
diff --git a/test/ejabberd_cyrsasl_test.exs b/test/ejabberd_cyrsasl_test.exs
index 0dc64ee44..d9b949294 100644
--- a/test/ejabberd_cyrsasl_test.exs
+++ b/test/ejabberd_cyrsasl_test.exs
@@ -71,8 +71,8 @@ defmodule EjabberdCyrsaslTest do
     response = "username=\"#{user}\",realm=\"#{domain}\",nonce=\"#{nonce}\",cnonce=\"#{cnonce}\"," <>
       "nc=\"#{nc}\",qop=auth,digest-uri=\"#{digest_uri}\",response=\"#{response_hash}\"," <>
       "charset=utf-8,algorithm=md5-sess"
-    assert {:continue, calc_str, state3} = :cyrsasl.server_step(state1, response)
-    assert {:ok, list} = :cyrsasl.server_step(state3, "")
+    assert {:continue, _calc_str, state3} = :cyrsasl.server_step(state1, response)
+    assert {:ok, _list} = :cyrsasl.server_step(state3, "")
   end
 
   defp calc_digest_sha(user, domain, pass, nc, nonce, cnonce) do
@@ -94,7 +94,7 @@ defmodule EjabberdCyrsaslTest do
   defp setup_anonymous_mocks() do
     :meck.unload
     mock(:ejabberd_auth_anonymous, :is_sasl_anonymous_enabled,
-      fn (host) ->
+      fn (_host) ->
         true
       end)
     mock(:ejabberd_auth, :is_user_exists,
@@ -119,7 +119,7 @@ defmodule EjabberdCyrsaslTest do
     end
   end
 
-  defp check_password(user, authzid, pass) do
+  defp check_password(_user, authzid, pass) do
     case get_password(authzid) do
       {^pass, mod} ->
         {true, mod}
@@ -128,7 +128,7 @@ defmodule EjabberdCyrsaslTest do
     end
   end
 
-  defp check_password_digest(user, authzid, pass, digest, digest_gen) do
+  defp check_password_digest(_user, authzid, _pass, digest, digest_gen) do
     case get_password(authzid) do
       {spass, mod} ->
         v = digest_gen.(spass)
diff --git a/test/mod_admin_extra_test.exs b/test/mod_admin_extra_test.exs
index 761b07b7c..03422264f 100644
--- a/test/mod_admin_extra_test.exs
+++ b/test/mod_admin_extra_test.exs
@@ -22,6 +22,9 @@ defmodule EjabberdModAdminExtraTest do
 	use ExUnit.Case, async: false
 
   require EjabberdAuthMock
+  require EjabberdSmMock
+  require ModLastMock
+  require ModRosterMock
 
 	@author "jsautret@process-one.net"
 
diff --git a/test/mod_http_api_mock_test.exs b/test/mod_http_api_mock_test.exs
index fcfdfee13..9cba35365 100644
--- a/test/mod_http_api_mock_test.exs
+++ b/test/mod_http_api_mock_test.exs
@@ -73,7 +73,7 @@ defmodule ModHttpApiMockTest do
 			end)
     :meck.expect(:ejabberd_commands, :get_command_policy_and_scope,
 			fn (@acommand) -> {:ok, :user, [:erlang.atom_to_binary(@acommand,:utf8)]} end)
-		:meck.expect(:ejabberd_commands, :get_commands,
+		:meck.expect(:ejabberd_commands, :get_exposed_commands,
 			fn () -> [@acommand] end)
 		:meck.expect(:ejabberd_commands, :execute_command,
 			fn (:undefined, {@user, @domain, @userpass, false}, @acommand, [], @version, _) ->
@@ -126,7 +126,7 @@ defmodule ModHttpApiMockTest do
 			end)
     :meck.expect(:ejabberd_commands, :get_command_policy_and_scope,
 			fn (@acommand) -> {:ok, :user, [:erlang.atom_to_binary(@acommand,:utf8), "ejabberd:user"]} end)
-		:meck.expect(:ejabberd_commands, :get_commands,
+		:meck.expect(:ejabberd_commands, :get_exposed_commands,
 			fn () -> [@acommand] end)
 		:meck.expect(:ejabberd_commands, :execute_command,
 			fn (:undefined, {@user, @domain, {:oauth, _token}, false},
@@ -219,7 +219,7 @@ defmodule ModHttpApiMockTest do
 			end)
     :meck.expect(:ejabberd_commands, :get_command_policy_and_scope,
 			fn (@acommand) -> {:ok, :user, [:erlang.atom_to_binary(@acommand,:utf8), "ejabberd:user"]} end)
-		:meck.expect(:ejabberd_commands, :get_commands,
+		:meck.expect(:ejabberd_commands, :get_exposed_commands,
 			fn () -> [@acommand] end)
 		:meck.expect(:ejabberd_commands, :execute_command,
 			fn (:undefined, {@user, @domain, {:oauth, _token}, false},
diff --git a/test/mod_http_api_test.exs b/test/mod_http_api_test.exs
index b440f3eb8..e2ae3d784 100644
--- a/test/mod_http_api_test.exs
+++ b/test/mod_http_api_test.exs
@@ -31,24 +31,24 @@ defmodule ModHttpApiTest do
     :ok = :mnesia.start
     :stringprep.start
     :ok = :ejabberd_config.start(["localhost"], [])
-
     :ok = :ejabberd_commands.init
-
     :ok = :ejabberd_commands.register_commands(cmds)
-    on_exit fn -> unregister_commands(cmds) end
+    on_exit fn ->
+      :meck.unload
+      unregister_commands(cmds) end
   end
 
   test "We can expose several commands to API at a time" do
     setup_mocks()
-    :ejabberd_config.add_local_option(:commands, [[{:add_commands, [:open_cmd, :user_cmd]}]])
-    commands = :ejabberd_commands.get_commands()
+    :ejabberd_commands.expose_commands([:open_cmd, :user_cmd])
+    commands = :ejabberd_commands.get_exposed_commands()
     assert Enum.member?(commands, :open_cmd)
     assert Enum.member?(commands, :user_cmd)
   end
 
   test "We can call open commands without authentication" do
     setup_mocks()
-    :ejabberd_config.add_local_option(:commands, [[{:add_commands, [:open_cmd]}]])
+    :ejabberd_commands.expose_commands([:open_cmd])
     request = request(method: :POST, ip: {{127,0,0,1},50000}, data: "[]")
     {200, _, _} = :mod_http_api.process(["open_cmd"], request)
   end
@@ -56,14 +56,14 @@ defmodule ModHttpApiTest do
   # This related to the commands config file option
   test "Attempting to access a command that is not exposed as HTTP API returns 403" do
     setup_mocks()
-    :ejabberd_config.add_local_option(:commands, [])
+    :ejabberd_commands.expose_commands([])
     request = request(method: :POST, ip: {{127,0,0,1},50000}, data: "[]")
     {403, _, _} = :mod_http_api.process(["open_cmd"], request)
   end
 
   test "Call to user, admin or restricted commands without authentication are rejected" do
     setup_mocks()
-    :ejabberd_config.add_local_option(:commands, [[{:add_commands, [:user_cmd, :admin_cmd, :restricted]}]])
+    :ejabberd_commands.expose_commands([:user_cmd, :admin_cmd, :restricted])
     request = request(method: :POST, ip: {{127,0,0,1},50000}, data: "[]")
     {403, _, _} = :mod_http_api.process(["user_cmd"], request)
     {403, _, _} = :mod_http_api.process(["admin_cmd"], request)
@@ -98,7 +98,7 @@ defmodule ModHttpApiTest do
   defp setup_mocks() do
     :meck.unload
     mock(:gen_mod, :get_module_opt,
-      fn (_server, :mod_http_api, admin_ip_access, _, _)  ->
+      fn (_server, :mod_http_api, _admin_ip_access, _, _)  ->
         [{:allow, [{:ip, {{127,0,0,2}, 32}}]}]
       end)
   end
diff --git a/test/test_helper.exs b/test/test_helper.exs
new file mode 100644
index 000000000..454f2338a
--- /dev/null
+++ b/test/test_helper.exs
@@ -0,0 +1,7 @@
+Code.require_file "ejabberd_auth_mock.exs", __DIR__
+Code.require_file "ejabberd_oauth_mock.exs", __DIR__
+Code.require_file "ejabberd_sm_mock.exs", __DIR__
+Code.require_file "mod_last_mock.exs", __DIR__
+Code.require_file "mod_roster_mock.exs", __DIR__
+
+ExUnit.start