Implement Credo software design suggestions

test/web/controllers/activity_pub_controller_test.exs

@@ -16,8 +16,7 @@ defmodule Mobilizon.Web.ActivityPubControllerTest do
   alias Mobilizon.Federation.ActivityPub
 
   alias Mobilizon.Web.ActivityPub.ActorView
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.PageView
+  alias Mobilizon.Web.{Endpoint, PageView}
   alias Mobilizon.Web.Router.Helpers, as: Routes
 
   setup_all do
@@ -104,7 +103,7 @@ defmodule Mobilizon.Web.ActivityPubControllerTest do
         conn =
           conn
           |> assign(:valid_signature, true)
-          |> post("#{Mobilizon.Web.Endpoint.url()}/inbox", data)
+          |> post("#{Endpoint.url()}/inbox", data)
 
         assert "ok" == json_response(conn, 200)
         :timer.sleep(500)

test/web/controllers/webfinger_controller_test.exs

@@ -11,6 +11,8 @@ defmodule Mobilizon.Web.WebFingerControllerTest do
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Federation.WebFinger
 
+  alias Mobilizon.Web.Endpoint
+
   setup_all do
     Mobilizon.Config.put([:instance, :federating], true)
 
@@ -22,7 +24,7 @@ defmodule Mobilizon.Web.WebFingerControllerTest do
 
     assert response(conn, 200) ==
              "<?xml version=\"1.0\" encoding=\"UTF-8\"?><XRD xmlns=\"http://docs.oasis-open.org/ns/xri/xrd-1.0\"><Link rel=\"lrdd\" template=\"#{
-               Mobilizon.Web.Endpoint.url()
+               Endpoint.url()
              }/.well-known/webfinger?resource={uri}\" type=\"application/xrd+xml\" /></XRD>"
 
     assert {"content-type", "application/xrd+xml; charset=utf-8"} in conn.resp_headers

test/web/proxy/media_proxy_test.exs

@@ -10,7 +10,7 @@ defmodule Mobilizon.Web.MediaProxyTest do
 
   alias Mobilizon.Config
 
-  alias Mobilizon.Web.MediaProxyController
+  alias Mobilizon.Web.{Endpoint, MediaProxyController}
 
   setup do
     enabled = Config.get([:media_proxy, :enabled])
@@ -35,8 +35,8 @@ defmodule Mobilizon.Web.MediaProxyTest do
     end
 
     test "ignores local url" do
-      local_url = Mobilizon.Web.Endpoint.url() <> "/hello"
-      local_root = Mobilizon.Web.Endpoint.url()
+      local_url = Endpoint.url() <> "/hello"
+      local_root = Endpoint.url()
       assert url(local_url) == local_url
       assert url(local_root) == local_root
     end
@@ -47,7 +47,7 @@ defmodule Mobilizon.Web.MediaProxyTest do
 
       assert String.starts_with?(
                encoded,
-               Config.get([:media_proxy, :base_url], Mobilizon.Web.Endpoint.url())
+               Config.get([:media_proxy, :base_url], Endpoint.url())
              )
 
       assert String.ends_with?(encoded, "/logo.png")
@@ -84,16 +84,16 @@ defmodule Mobilizon.Web.MediaProxyTest do
     end
 
     test "validates signature" do
-      secret_key_base = Config.get([Mobilizon.Web.Endpoint, :secret_key_base])
+      secret_key_base = Config.get([Endpoint, :secret_key_base])
 
       on_exit(fn ->
-        Config.put([Mobilizon.Web.Endpoint, :secret_key_base], secret_key_base)
+        Config.put([Endpoint, :secret_key_base], secret_key_base)
       end)
 
       encoded = url("https://pleroma.social")
 
       Config.put(
-        [Mobilizon.Web.Endpoint, :secret_key_base],
+        [Endpoint, :secret_key_base],
         "00000000000000000000000000000000000000000000000"
       )
 

test/web/upload/upload_test.exs

@@ -8,7 +8,7 @@ defmodule Mobilizon.UploadTest do
 
   alias Mobilizon.Config
 
-  alias Mobilizon.Web.Upload
+  alias Mobilizon.Web.{Endpoint, Upload}
   alias Mobilizon.Web.Upload.Uploader
 
   describe "Storing a file with the Local uploader" do
@@ -31,7 +31,7 @@ defmodule Mobilizon.UploadTest do
                size: 13_227
              } = data
 
-      assert String.starts_with?(url, Mobilizon.Web.Endpoint.url() <> "/media/")
+      assert String.starts_with?(url, Endpoint.url() <> "/media/")
     end
 
     test "returns a media url with configured base_url" do
@@ -59,10 +59,10 @@ defmodule Mobilizon.UploadTest do
         filename: "an [image.jpg"
       }
 
-      {:ok, data} = Upload.store(file, filters: [Mobilizon.Web.Upload.Filter.Dedupe])
+      {:ok, data} = Upload.store(file, filters: [Upload.Filter.Dedupe])
 
       assert data.url ==
-               Mobilizon.Web.Endpoint.url() <>
+               Endpoint.url() <>
                  "/media/590523d60d3831ec92d05cdd871078409d5780903910efec5cd35ab1b0f19d11.jpg"
     end
 
@@ -88,7 +88,7 @@ defmodule Mobilizon.UploadTest do
         filename: "an [image.jpg"
       }
 
-      {:ok, data} = Upload.store(file, filters: [Mobilizon.Web.Upload.Filter.Dedupe])
+      {:ok, data} = Upload.store(file, filters: [Upload.Filter.Dedupe])
       assert data.content_type == "image/jpeg"
     end
 
@@ -140,7 +140,7 @@ defmodule Mobilizon.UploadTest do
         filename: "an [image.jpg"
       }
 
-      {:ok, data} = Upload.store(file, filters: [Mobilizon.Web.Upload.Filter.AnonymizeFilename])
+      {:ok, data} = Upload.store(file, filters: [Upload.Filter.AnonymizeFilename])
 
       refute data.name == "an [image.jpg"
     end
@@ -212,7 +212,7 @@ defmodule Mobilizon.UploadTest do
              content_type: "image/jpeg"
            } = data
 
-    assert String.starts_with?(url, Mobilizon.Web.Endpoint.url() <> "/media/")
+    assert String.starts_with?(url, Endpoint.url() <> "/media/")
 
     %URI{path: "/media/" <> path} = URI.parse(url)
     {Config.get!([Uploader.Local, :uploads]) <> "/" <> path, url}