fix tests in CI

5 files changed, 35 insertions, 16 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1dfcee7..9d6c6d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,8 +11,18 @@ before_script:
 
 test:
   stage: static_analysis
+  services:
+    - postgres:latest
+  variables:
+    POSTGRES_DB: matrix_app_service_test
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: postgres
+    POSTGRES_HOST: postgres
+    POSTGRES_HOST_AUTH_METHOD: trust
   script:
     - MIX_ENV=test mix compile
+    - MIX_ENV=test mix ecto.create
+    - MIX_ENV=test mix ecto.migrate
     - mix test --cover
   artifacts:
     when: always
diff --git a/config/test.exs b/config/test.exs
index c9fbbd4..905574a 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -6,10 +6,10 @@ use Mix.Config
 # to provide built-in test partitioning in CI environment.
 # Run `mix help test` for more information.
 config :matrix_app_service, MatrixAppService.Repo,
-  username: "postgres",
-  password: "postgres",
+  username: System.get_env("POSTGRES_USER") || "postgres",
+  password: System.get_env("POSTGRES_PASSWORD") || "postgres",
   database: "matrix_app_service_test#{System.get_env("MIX_TEST_PARTITION")}",
-  hostname: "localhost",
+  hostname: System.get_env("POSTGRES_HOST") || "localhost",
   pool: Ecto.Adapters.SQL.Sandbox
 
 # We don't run a server during test. If one is required,
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index e1ce056..582801d 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -32,6 +32,12 @@ defmodule MatrixAppServiceWeb.ConnCase do
   end
 
   setup tags do
+    :ok = Ecto.Adapters.SQL.Sandbox.checkout(MatrixAppService.Repo)
+
+    unless tags[:async] do
+      Ecto.Adapters.SQL.Sandbox.mode(MatrixAppService.Repo, {:shared, self()})
+    end
+
     conn =
       if tags[:authenticated] do
         Phoenix.ConnTest.build_conn(:get, "/", %{
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 475f748..76994a7 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -2,20 +2,20 @@ defmodule MatrixAppService.DataCase do
   @moduledoc """
   This module defines the setup for tests requiring
   access to the application's data layer.
+
   You may define functions here to be used as helpers in
   your tests.
+
   Finally, if the test case interacts with the database,
-  it cannot be async. For this reason, every test runs
-  inside a transaction which is reset at the beginning
-  of the test unless the test case is marked as async.
+  we enable the SQL sandbox, so changes done to the database
+  are reverted at the end of every test. If you are using
+  PostgreSQL, you can even run database tests asynchronously
+  by setting `use MatrixAppService.DataCase, async: true`, although
+  this option is not recommended for other databases.
   """
 
   use ExUnit.CaseTemplate
 
-  alias Ecto.Adapters.SQL.Sandbox
-  alias Ecto.Changeset
-  alias MatrixAppService.Repo
-
   using do
     quote do
       alias MatrixAppService.Repo
@@ -28,25 +28,27 @@ defmodule MatrixAppService.DataCase do
   end
 
   setup tags do
-    :ok = Sandbox.checkout(Repo)
+    :ok = Ecto.Adapters.SQL.Sandbox.checkout(MatrixAppService.Repo)
 
     unless tags[:async] do
-      Sandbox.mode(Repo, {:shared, self()})
+      Ecto.Adapters.SQL.Sandbox.mode(MatrixAppService.Repo, {:shared, self()})
     end
 
     :ok
   end
 
   @doc """
-  A helper that transform changeset errors to a map of messages.
+  A helper that transforms changeset errors into a map of messages.
+
       assert {:error, changeset} = Accounts.create_user(%{password: "short"})
       assert "password is too short" in errors_on(changeset).password
       assert %{password: ["password is too short"]} = errors_on(changeset)
+
   """
   def errors_on(changeset) do
-    Changeset.traverse_errors(changeset, fn {message, opts} ->
-      Enum.reduce(opts, message, fn {key, value}, acc ->
-        String.replace(acc, "%{#{key}}", to_string(value))
+    Ecto.Changeset.traverse_errors(changeset, fn {message, opts} ->
+      Regex.replace(~r"%{(\w+)}", message, fn _, key ->
+        opts |> Keyword.get(String.to_existing_atom(key), key) |> to_string()
       end)
     end)
   end
diff --git a/test/test_helper.exs b/test/test_helper.exs
index 3140500..baf9e64 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -1,2 +1,3 @@
+Ecto.Adapters.SQL.Sandbox.mode(MatrixAppService.Repo, :manual)
 ExUnit.configure(formatters: [JUnitFormatter, ExUnit.CLIFormatter])
 ExUnit.start()