Fix software design suggestions

test/mobilizon/service/activity_pub/activity_pub_test.exs

@@ -16,8 +16,11 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
   alias Mobilizon.Events
   alias Mobilizon.Events.Event
   alias Mobilizon.Service.ActivityPub
+  alias Mobilizon.Service.ActivityPub.Converter
   alias Mobilizon.Service.HTTPSignatures.Signature
 
+  alias MobilizonWeb.ActivityPub.ActorView
+
   setup_all do
     HTTPoison.start()
   end
@@ -162,7 +165,7 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
 
     test "it creates an update activity with the new actor data" do
       actor = insert(:actor)
-      actor_data = MobilizonWeb.ActivityPub.ActorView.render("actor.json", %{actor: actor})
+      actor_data = ActorView.render("actor.json", %{actor: actor})
       actor_data = Map.put(actor_data, "summary", @updated_actor_summary)
 
       {:ok, update, updated_actor} =
@@ -191,7 +194,7 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
     test "it creates an update activity with the new event data" do
       actor = insert(:actor)
       event = insert(:event, organizer_actor: actor)
-      event_data = Mobilizon.Service.ActivityPub.Converters.Event.model_to_as(event)
+      event_data = Converter.Event.model_to_as(event)
       event_data = Map.put(event_data, "startTime", @updated_start_time)
 
       {:ok, update, updated_event} =

test/mobilizon/service/activity_pub/converter/actor_test.exs

@@ -1,8 +1,8 @@
-defmodule Mobilizon.Service.ActivityPub.Converters.ActorTest do
+defmodule Mobilizon.Service.ActivityPub.Converter.ActorTest do
   use Mobilizon.DataCase
 
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Service.ActivityPub.Converters.Actor, as: ActorConverter
+  alias Mobilizon.Service.ActivityPub.Converter.Actor, as: ActorConverter
 
   describe "actor to AS" do
     test "valid actor to as" do

test/mobilizon/service/activity_pub/transmogrifier_test.exs

@@ -18,6 +18,8 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
   alias Mobilizon.Service.ActivityPub.{Activity, Utils}
   alias Mobilizon.Service.ActivityPub.Transmogrifier
 
+  alias MobilizonWeb.API
+
   setup_all do
     HTTPoison.start()
   end
@@ -845,7 +847,7 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
       other_actor = insert(:actor)
 
       {:ok, activity, _} =
-        MobilizonWeb.API.Comments.create_comment(
+        API.Comments.create_comment(
           actor.preferred_username,
           "hey, @#{other_actor.preferred_username}, how are ya? #2hu"
         )
@@ -881,8 +883,7 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
     test "it adds the json-ld context and the conversation property" do
       actor = insert(:actor)
 
-      {:ok, activity, _} =
-        MobilizonWeb.API.Comments.create_comment(actor.preferred_username, "hey")
+      {:ok, activity, _} = API.Comments.create_comment(actor.preferred_username, "hey")
 
       {:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
 
@@ -892,8 +893,7 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
     test "it sets the 'attributedTo' property to the actor of the object if it doesn't have one" do
       actor = insert(:actor)
 
-      {:ok, activity, _} =
-        MobilizonWeb.API.Comments.create_comment(actor.preferred_username, "hey")
+      {:ok, activity, _} = API.Comments.create_comment(actor.preferred_username, "hey")
 
       {:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
 
@@ -903,8 +903,7 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
     test "it strips internal hashtag data" do
       actor = insert(:actor)
 
-      {:ok, activity, _} =
-        MobilizonWeb.API.Comments.create_comment(actor.preferred_username, "#2hu")
+      {:ok, activity, _} = API.Comments.create_comment(actor.preferred_username, "#2hu")
 
       expected_tag = %{
         "href" => MobilizonWeb.Endpoint.url() <> "/tags/2hu",
@@ -920,8 +919,7 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
     test "it strips internal fields" do
       actor = insert(:actor)
 
-      {:ok, activity, _} =
-        MobilizonWeb.API.Comments.create_comment(actor.preferred_username, "#2hu")
+      {:ok, activity, _} = API.Comments.create_comment(actor.preferred_username, "#2hu")
 
       {:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
 

test/mobilizon/service/activity_pub/utils_test.exs

@@ -5,7 +5,7 @@ defmodule Mobilizon.Service.ActivityPub.UtilsTest do
 
   import Mobilizon.Factory
 
-  alias Mobilizon.Service.ActivityPub.Utils
+  alias Mobilizon.Service.ActivityPub.{Converter, Utils}
 
   alias MobilizonWeb.Endpoint
   alias MobilizonWeb.Router.Helpers, as: Routes
@@ -28,7 +28,7 @@ defmodule Mobilizon.Service.ActivityPub.UtilsTest do
                "id" => Routes.page_url(Endpoint, :comment, reply.uuid),
                "inReplyTo" => comment.url,
                "attributedTo" => reply.actor.url
-             } == Mobilizon.Service.ActivityPub.Converters.Comment.model_to_as(reply)
+             } == Converter.Comment.model_to_as(reply)
     end
 
     test "comment data from map" do

test/mobilizon_web/api/report_test.exs

@@ -7,6 +7,7 @@ defmodule MobilizonWeb.API.ReportTest do
   alias Mobilizon.Events.{Comment, Event}
   alias Mobilizon.Reports.{Note, Report}
   alias Mobilizon.Service.ActivityPub.Activity
+  alias Mobilizon.Service.Formatter
   alias Mobilizon.Users
   alias Mobilizon.Users.User
 
@@ -86,7 +87,7 @@ defmodule MobilizonWeb.API.ReportTest do
         _comment_2 = insert(:comment, actor: reported)
 
       comment = "This is really not acceptable, remote admin I don't know"
-      encoded_comment = Mobilizon.Service.Formatter.html_escape(comment, "text/plain")
+      encoded_comment = Formatter.html_escape(comment, "text/plain")
 
       assert {:ok, %Activity{} = flag_activity, _} =
                Reports.report(%{

test/mobilizon_web/controllers/nodeinfo_controller_test.exs

@@ -3,27 +3,20 @@ defmodule MobilizonWeb.NodeInfoControllerTest do
 
   alias Mobilizon.Config
 
+  alias MobilizonWeb.Endpoint
+  alias MobilizonWeb.Router.Helpers, as: Routes
+
   test "Get node info schemas", %{conn: conn} do
     conn = get(conn, node_info_path(conn, :schemas))
 
     assert json_response(conn, 200) == %{
              "links" => [
                %{
-                 "href" =>
-                   MobilizonWeb.Router.Helpers.node_info_url(
-                     MobilizonWeb.Endpoint,
-                     :nodeinfo,
-                     "2.0"
-                   ),
+                 "href" => Routes.node_info_url(Endpoint, :nodeinfo, "2.0"),
                  "rel" => "http://nodeinfo.diaspora.software/ns/schema/2.0"
                },
                %{
-                 "href" =>
-                   MobilizonWeb.Router.Helpers.node_info_url(
-                     MobilizonWeb.Endpoint,
-                     :nodeinfo,
-                     "2.1"
-                   ),
+                 "href" => Routes.node_info_url(Endpoint, :nodeinfo, "2.1"),
                  "rel" => "http://nodeinfo.diaspora.software/ns/schema/2.1"
                }
              ]

test/mobilizon_web/resolvers/admin_resolver_test.exs

@@ -9,6 +9,7 @@ defmodule MobilizonWeb.Resolvers.AdminResolverTest do
   alias Mobilizon.Users.User
 
   alias MobilizonWeb.AbsintheHelpers
+  alias MobilizonWeb.API
 
   describe "Resolver: List the action logs" do
     @note_content "This a note on a report"
@@ -20,12 +21,11 @@ defmodule MobilizonWeb.Resolvers.AdminResolverTest do
       %Actor{} = moderator_2 = insert(:actor, user: user_moderator_2)
 
       %Report{} = report = insert(:report)
-      MobilizonWeb.API.Reports.update_report_status(moderator, report, "resolved")
+      API.Reports.update_report_status(moderator, report, "resolved")
 
-      {:ok, %Note{} = note} =
-        MobilizonWeb.API.Reports.create_report_note(report, moderator_2, @note_content)
+      {:ok, %Note{} = note} = API.Reports.create_report_note(report, moderator_2, @note_content)
 
-      MobilizonWeb.API.Reports.delete_report_note(note, moderator_2)
+      API.Reports.delete_report_note(note, moderator_2)
 
       query = """
       {

test/support/channel_case.ex

@@ -15,6 +15,10 @@ defmodule MobilizonWeb.ChannelCase do
 
   use ExUnit.CaseTemplate
 
+  alias Ecto.Adapters.SQL.Sandbox, as: Adapter
+
+  alias Mobilizon.Storage.Repo
+
   using do
     quote do
       # Import conveniences for testing with channels
@@ -26,11 +30,9 @@ defmodule MobilizonWeb.ChannelCase do
   end
 
   setup tags do
-    :ok = Ecto.Adapters.SQL.Sandbox.checkout(Mobilizon.Storage.Repo)
+    :ok = Adapter.checkout(Repo)
 
-    unless tags[:async] do
-      Ecto.Adapters.SQL.Sandbox.mode(Mobilizon.Storage.Repo, {:shared, self()})
-    end
+    unless tags[:async], do: Adapter.mode(Repo, {:shared, self()})
 
     :ok
   end

test/support/conn_case.ex

@@ -15,6 +15,11 @@ defmodule MobilizonWeb.ConnCase do
 
   use ExUnit.CaseTemplate
 
+  alias Ecto.Adapters.SQL.Sandbox, as: Adapter
+
+  alias Mobilizon.Storage.Repo
+  alias Mobilizon.Users.User
+
   using do
     quote do
       # Import conveniences for testing with connections
@@ -24,7 +29,7 @@ defmodule MobilizonWeb.ConnCase do
       # The default endpoint for testing
       @endpoint MobilizonWeb.Endpoint
 
-      def auth_conn(%Plug.Conn{} = conn, %Mobilizon.Users.User{} = user) do
+      def auth_conn(%Plug.Conn{} = conn, %User{} = user) do
         {:ok, token, _claims} = MobilizonWeb.Guardian.encode_and_sign(user)
 
         conn
@@ -35,11 +40,9 @@ defmodule MobilizonWeb.ConnCase do
   end
 
   setup tags do
-    :ok = Ecto.Adapters.SQL.Sandbox.checkout(Mobilizon.Storage.Repo)
+    :ok = Adapter.checkout(Repo)
 
-    unless tags[:async] do
-      Ecto.Adapters.SQL.Sandbox.mode(Mobilizon.Storage.Repo, {:shared, self()})
-    end
+    unless tags[:async], do: Adapter.mode(Repo, {:shared, self()})
 
     {:ok, conn: Phoenix.ConnTest.build_conn()}
   end

test/support/data_case.ex

@@ -14,7 +14,10 @@ defmodule Mobilizon.DataCase do
 
   use ExUnit.CaseTemplate
 
+  alias Ecto.Adapters.SQL.Sandbox, as: Adapter
+
   alias Mobilizon.Config
+  alias Mobilizon.Storage.Repo
 
   using do
     quote do
@@ -28,11 +31,9 @@ defmodule Mobilizon.DataCase do
   end
 
   setup tags do
-    :ok = Ecto.Adapters.SQL.Sandbox.checkout(Mobilizon.Storage.Repo)
+    :ok = Adapter.checkout(Repo)
 
-    unless tags[:async] do
-      Ecto.Adapters.SQL.Sandbox.mode(Mobilizon.Storage.Repo, {:shared, self()})
-    end
+    unless tags[:async], do: Adapter.mode(Repo, {:shared, self()})
 
     :ok
   end