Rename MobilizonWeb to Mobilizon.Web

2020-01-26 21:36:50 +01:00
parent b3f8d52bc9
commit 8856cc2f55
143 changed files with 490 additions and 490 deletions
--- a/test/federation/activity_pub/transmogrifier_test.exs
+++ b/test/federation/activity_pub/transmogrifier_test.exs
@@ -961,7 +961,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
      }

      expected_tag = %{
-        "href" => MobilizonWeb.Endpoint.url() <> "/tags/2hu",
+        "href" => Mobilizon.Web.Endpoint.url() <> "/tags/2hu",
        "type" => "Hashtag",
        "name" => "#2hu"
      }
@@ -996,7 +996,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
      {:ok, activity, _} = API.Comments.create_comment(%{actor_id: actor.id, text: "#2hu"})

      expected_tag = %{
-        "href" => MobilizonWeb.Endpoint.url() <> "/tags/2hu",
+        "href" => Mobilizon.Web.Endpoint.url() <> "/tags/2hu",
        "type" => "Hashtag",
        "name" => "#2hu"
      }
--- a/test/federation/activity_pub/utils_test.exs
+++ b/test/federation/activity_pub/utils_test.exs
@@ -7,8 +7,8 @@ defmodule Mobilizon.Federation.ActivityPub.UtilsTest do

  alias Mobilizon.Federation.ActivityStream.Converter

-  alias MobilizonWeb.Endpoint
-  alias MobilizonWeb.Router.Helpers, as: Routes
+  alias Mobilizon.Web.Endpoint
+  alias Mobilizon.Web.Router.Helpers, as: Routes

  setup_all do
    HTTPoison.start()
--- a/test/federation/web_finger/web_finger_test.exs
+++ b/test/federation/web_finger/web_finger_test.exs
@@ -24,7 +24,7 @@ defmodule Mobilizon.Federation.WebFingerTest do
    test "returns a link to the xml lrdd" do
      host_info = WebFinger.host_meta()

-      assert String.contains?(host_info, MobilizonWeb.Endpoint.url())
+      assert String.contains?(host_info, Mobilizon.Web.Endpoint.url())
    end
  end

@@ -33,7 +33,7 @@ defmodule Mobilizon.Federation.WebFingerTest do
      actor = insert(:actor)

      {:ok, result} =
-        WebFinger.webfinger("#{actor.preferred_username}@#{MobilizonWeb.Endpoint.host()}", "JSON")
+        WebFinger.webfinger("#{actor.preferred_username}@#{Mobilizon.Web.Endpoint.host()}", "JSON")

      assert is_map(result)
    end
--- a/test/fixtures/vcr_cassettes/relay/fetch_relay_follow.json
+++ b/test/fixtures/vcr_cassettes/relay/fetch_relay_follow.json
@@ -81,7 +81,7 @@
    },
    "response": {
      "binary": false,
-      "body": "# HTTPoison.Error at POST /inbox\n\nException:\n\n    ** (HTTPoison.Error) :nxdomain\n        (httpoison) lib/httpoison.ex:128: HTTPoison.request!/5\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:610: Mobilizon.Service.ActivityPub.fetch_and_prepare_actor_from_url/1\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:473: Mobilizon.Service.ActivityPub.make_actor_from_url/2\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:122: Mobilizon.Service.ActivityPub.get_or_fetch_actor_by_url/2\n        (mobilizon) lib/service/http_signatures/signature.ex:54: Mobilizon.Federation.HTTPSignatures.Signature.get_public_key_for_url/1\n        (mobilizon) lib/service/http_signatures/signature.ex:74: Mobilizon.Federation.HTTPSignatures.Signature.fetch_public_key/1\n        (http_signatures) lib/http_signatures/http_signatures.ex:40: HTTPSignatures.validate_conn/1\n        (mobilizon) lib/mobilizon_web/http_signature.ex:45: MobilizonWeb.HTTPSignaturePlug.call/2\n        (mobilizon) MobilizonWeb.Router.activity_pub_signature/2\n        (mobilizon) lib/mobilizon_web/router.ex:1: MobilizonWeb.Router.__pipe_through7__/1\n        (phoenix) lib/phoenix/router.ex:283: Phoenix.Router.__call__/2\n        (mobilizon) lib/mobilizon_web/endpoint.ex:1: MobilizonWeb.Endpoint.plug_builder_call/2\n        (mobilizon) lib/plug/debugger.ex:122: MobilizonWeb.Endpoint.\"call (overridable 3)\"/2\n        (mobilizon) lib/mobilizon_web/endpoint.ex:1: MobilizonWeb.Endpoint.call/2\n        (phoenix) lib/phoenix/endpoint/cowboy2_handler.ex:42: Phoenix.Endpoint.Cowboy2Handler.init/4\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_handler.erl:41: :cowboy_handler.execute/2\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_stream_h.erl:320: :cowboy_stream_h.execute/3\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_stream_h.erl:302: :cowboy_stream_h.request_process/3\n        (stdlib) proc_lib.erl:249: :proc_lib.init_p_do_apply/3\n    \n\n## Connection details\n\n### Params\n\n    %{\"@context\" => [\"https://www.w3.org/ns/activitystreams\", \"https://litepub.social/litepub/context.jsonld\", %{\"Hashtag\" => \"as:Hashtag\", \"category\" => \"sc:category\", \"ical\" => \"http://www.w3.org/2002/12/cal/ical#\", \"joinMode\" => %{\"@id\" => \"mz:joinMode\", \"@type\" => \"mz:joinModeType\"}, \"joinModeType\" => %{\"@id\" => \"mz:joinModeType\", \"@type\" => \"rdfs:Class\"}, \"maximumAttendeeCapacity\" => \"sc:maximumAttendeeCapacity\", \"mz\" => \"https://joinmobilizon.org/ns#\", \"repliesModerationOption\" => %{\"@id\" => \"mz:repliesModerationOption\", \"@type\" => \"mz:repliesModerationOptionType\"}, \"repliesModerationOptionType\" => %{\"@id\" => \"mz:repliesModerationOptionType\", \"@type\" => \"rdfs:Class\"}, \"sc\" => \"http://schema.org#\", \"uuid\" => \"sc:identifier\"}], \"actor\" => \"http://mobilizon.test/relay\", \"cc\" => [\"https://www.w3.org/ns/activitystreams#Public\"], \"id\" => \"http://mobilizon.test/follow/b7791977-2a75-4715-815b-6e7125065b71\", \"object\" => \"http://mobilizon1.com/relay\", \"to\" => [\"http://mobilizon1.com/relay\"], \"type\" => \"Follow\"}\n\n### Request info\n\n  * URI: http://mobilizon1.com:80/inbox\n  * Query string: \n\n### Headers\n  \n  * connection: upgrade\n  * content-length: 912\n  * content-type: application/activity+json\n  * date: Fri, 13 Dec 2019 09:41:41 GMT\n  * digest: SHA-256=ibNFcsnBeCCjWZo9We60tKfbRN3el0WCMVdOxtuC1cg=\n  * host: mobilizon1.com\n  * signature: keyId=\"http://mobilizon.test/relay#main-key\",algorithm=\"rsa-sha256\",headers=\"(request-target) content-length date digest host\",signature=\"WbyGHT/WdvdRpWek8uCGHrFSblLpg+Iq802R5S2cjNj035OKpxRmu1r8u9Qr5KGIKgZn6LHt9YmB+PNlwsubPtTSkJpE8AAUDMHLKgCrH7A5Q6x6GlARl5bHNo4QtOxkXvnEbn31xfNDNp70QqZb/emw95TnELYUlMLZds0qYutT8U4WdDhSWcVytQmKJWNZXxEj+KlMDUaxag3lGscJ/HY0F+yGNov7FHthid1Y4LTGFsp/tismnMTlba12NH/kXPHtduNsX8uxFslM2ODwqAaospTGEpXmr9CPgbNy7626qgYaR2RdB/fYlCayLI4JJIlH8gOdocGHPrWNtVEHaQ==\"\n  * user-agent: hackney/1.15.2\n  * x-forwarded-for: 127.0.0.1\n  * x-real-ip: 127.0.0.1\n\n### Session\n\n    %{}\n",
+      "body": "# HTTPoison.Error at POST /inbox\n\nException:\n\n    ** (HTTPoison.Error) :nxdomain\n        (httpoison) lib/httpoison.ex:128: HTTPoison.request!/5\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:610: Mobilizon.Service.ActivityPub.fetch_and_prepare_actor_from_url/1\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:473: Mobilizon.Service.ActivityPub.make_actor_from_url/2\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:122: Mobilizon.Service.ActivityPub.get_or_fetch_actor_by_url/2\n        (mobilizon) lib/service/http_signatures/signature.ex:54: Mobilizon.Federation.HTTPSignatures.Signature.get_public_key_for_url/1\n        (mobilizon) lib/service/http_signatures/signature.ex:74: Mobilizon.Federation.HTTPSignatures.Signature.fetch_public_key/1\n        (http_signatures) lib/http_signatures/http_signatures.ex:40: HTTPSignatures.validate_conn/1\n        (mobilizon) lib/mobilizon_web/http_signature.ex:45: Mobilizon.Web.HTTPSignaturePlug.call/2\n        (mobilizon) Mobilizon.Web.Router.activity_pub_signature/2\n        (mobilizon) lib/mobilizon_web/router.ex:1: Mobilizon.Web.Router.__pipe_through7__/1\n        (phoenix) lib/phoenix/router.ex:283: Phoenix.Router.__call__/2\n        (mobilizon) lib/mobilizon_web/endpoint.ex:1: Mobilizon.Web.Endpoint.plug_builder_call/2\n        (mobilizon) lib/plug/debugger.ex:122: Mobilizon.Web.Endpoint.\"call (overridable 3)\"/2\n        (mobilizon) lib/mobilizon_web/endpoint.ex:1: Mobilizon.Web.Endpoint.call/2\n        (phoenix) lib/phoenix/endpoint/cowboy2_handler.ex:42: Phoenix.Endpoint.Cowboy2Handler.init/4\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_handler.erl:41: :cowboy_handler.execute/2\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_stream_h.erl:320: :cowboy_stream_h.execute/3\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_stream_h.erl:302: :cowboy_stream_h.request_process/3\n        (stdlib) proc_lib.erl:249: :proc_lib.init_p_do_apply/3\n    \n\n## Connection details\n\n### Params\n\n    %{\"@context\" => [\"https://www.w3.org/ns/activitystreams\", \"https://litepub.social/litepub/context.jsonld\", %{\"Hashtag\" => \"as:Hashtag\", \"category\" => \"sc:category\", \"ical\" => \"http://www.w3.org/2002/12/cal/ical#\", \"joinMode\" => %{\"@id\" => \"mz:joinMode\", \"@type\" => \"mz:joinModeType\"}, \"joinModeType\" => %{\"@id\" => \"mz:joinModeType\", \"@type\" => \"rdfs:Class\"}, \"maximumAttendeeCapacity\" => \"sc:maximumAttendeeCapacity\", \"mz\" => \"https://joinmobilizon.org/ns#\", \"repliesModerationOption\" => %{\"@id\" => \"mz:repliesModerationOption\", \"@type\" => \"mz:repliesModerationOptionType\"}, \"repliesModerationOptionType\" => %{\"@id\" => \"mz:repliesModerationOptionType\", \"@type\" => \"rdfs:Class\"}, \"sc\" => \"http://schema.org#\", \"uuid\" => \"sc:identifier\"}], \"actor\" => \"http://mobilizon.test/relay\", \"cc\" => [\"https://www.w3.org/ns/activitystreams#Public\"], \"id\" => \"http://mobilizon.test/follow/b7791977-2a75-4715-815b-6e7125065b71\", \"object\" => \"http://mobilizon1.com/relay\", \"to\" => [\"http://mobilizon1.com/relay\"], \"type\" => \"Follow\"}\n\n### Request info\n\n  * URI: http://mobilizon1.com:80/inbox\n  * Query string: \n\n### Headers\n  \n  * connection: upgrade\n  * content-length: 912\n  * content-type: application/activity+json\n  * date: Fri, 13 Dec 2019 09:41:41 GMT\n  * digest: SHA-256=ibNFcsnBeCCjWZo9We60tKfbRN3el0WCMVdOxtuC1cg=\n  * host: mobilizon1.com\n  * signature: keyId=\"http://mobilizon.test/relay#main-key\",algorithm=\"rsa-sha256\",headers=\"(request-target) content-length date digest host\",signature=\"WbyGHT/WdvdRpWek8uCGHrFSblLpg+Iq802R5S2cjNj035OKpxRmu1r8u9Qr5KGIKgZn6LHt9YmB+PNlwsubPtTSkJpE8AAUDMHLKgCrH7A5Q6x6GlARl5bHNo4QtOxkXvnEbn31xfNDNp70QqZb/emw95TnELYUlMLZds0qYutT8U4WdDhSWcVytQmKJWNZXxEj+KlMDUaxag3lGscJ/HY0F+yGNov7FHthid1Y4LTGFsp/tismnMTlba12NH/kXPHtduNsX8uxFslM2ODwqAaospTGEpXmr9CPgbNy7626qgYaR2RdB/fYlCayLI4JJIlH8gOdocGHPrWNtVEHaQ==\"\n  * user-agent: hackney/1.15.2\n  * x-forwarded-for: 127.0.0.1\n  * x-real-ip: 127.0.0.1\n\n### Session\n\n    %{}\n",
      "headers": {
        "Server": "nginx/1.16.1",
        "Date": "Fri, 13 Dec 2019 09:41:41 GMT",
--- a/test/fixtures/vcr_cassettes/relay/fetch_relay_unfollow.json
+++ b/test/fixtures/vcr_cassettes/relay/fetch_relay_unfollow.json
@@ -81,7 +81,7 @@
    },
    "response": {
      "binary": false,
-      "body": "# HTTPoison.Error at POST /inbox\n\nException:\n\n    ** (HTTPoison.Error) :nxdomain\n        (httpoison) lib/httpoison.ex:128: HTTPoison.request!/5\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:610: Mobilizon.Service.ActivityPub.fetch_and_prepare_actor_from_url/1\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:473: Mobilizon.Service.ActivityPub.make_actor_from_url/2\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:122: Mobilizon.Service.ActivityPub.get_or_fetch_actor_by_url/2\n        (mobilizon) lib/service/http_signatures/signature.ex:54: Mobilizon.Service.HTTPSignatures.Signature.get_public_key_for_url/1\n        (mobilizon) lib/service/http_signatures/signature.ex:74: Mobilizon.Service.HTTPSignatures.Signature.fetch_public_key/1\n        (http_signatures) lib/http_signatures/http_signatures.ex:40: HTTPSignatures.validate_conn/1\n        (mobilizon) lib/mobilizon_web/http_signature.ex:45: MobilizonWeb.HTTPSignaturePlug.call/2\n        (mobilizon) MobilizonWeb.Router.activity_pub_signature/2\n        (mobilizon) lib/mobilizon_web/router.ex:1: MobilizonWeb.Router.__pipe_through7__/1\n        (phoenix) lib/phoenix/router.ex:283: Phoenix.Router.__call__/2\n        (mobilizon) lib/mobilizon_web/endpoint.ex:1: MobilizonWeb.Endpoint.plug_builder_call/2\n        (mobilizon) lib/plug/debugger.ex:122: MobilizonWeb.Endpoint.\"call (overridable 3)\"/2\n        (mobilizon) lib/mobilizon_web/endpoint.ex:1: MobilizonWeb.Endpoint.call/2\n        (phoenix) lib/phoenix/endpoint/cowboy2_handler.ex:42: Phoenix.Endpoint.Cowboy2Handler.init/4\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_handler.erl:41: :cowboy_handler.execute/2\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_stream_h.erl:320: :cowboy_stream_h.execute/3\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_stream_h.erl:302: :cowboy_stream_h.request_process/3\n        (stdlib) proc_lib.erl:249: :proc_lib.init_p_do_apply/3\n    \n\n## Connection details\n\n### Params\n\n    %{\"@context\" => [\"https://www.w3.org/ns/activitystreams\", \"https://litepub.social/litepub/context.jsonld\", %{\"Hashtag\" => \"as:Hashtag\", \"category\" => \"sc:category\", \"ical\" => \"http://www.w3.org/2002/12/cal/ical#\", \"joinMode\" => %{\"@id\" => \"mz:joinMode\", \"@type\" => \"mz:joinModeType\"}, \"joinModeType\" => %{\"@id\" => \"mz:joinModeType\", \"@type\" => \"rdfs:Class\"}, \"maximumAttendeeCapacity\" => \"sc:maximumAttendeeCapacity\", \"mz\" => \"https://joinmobilizon.org/ns#\", \"repliesModerationOption\" => %{\"@id\" => \"mz:repliesModerationOption\", \"@type\" => \"mz:repliesModerationOptionType\"}, \"repliesModerationOptionType\" => %{\"@id\" => \"mz:repliesModerationOptionType\", \"@type\" => \"rdfs:Class\"}, \"sc\" => \"http://schema.org#\", \"uuid\" => \"sc:identifier\"}], \"actor\" => \"http://mobilizon.test/relay\", \"cc\" => [\"https://www.w3.org/ns/activitystreams#Public\"], \"id\" => \"http://mobilizon.test/follow/57a6973e-f43f-4533-bf71-7a14a4c6e5ac\", \"object\" => \"http://mobilizon1.com/relay\", \"to\" => [\"http://mobilizon1.com/relay\"], \"type\" => \"Follow\"}\n\n### Request info\n\n  * URI: http://mobilizon1.com:80/inbox\n  * Query string: \n\n### Headers\n  \n  * connection: upgrade\n  * content-length: 912\n  * content-type: application/activity+json\n  * date: Fri, 13 Dec 2019 09:41:40 GMT\n  * digest: SHA-256=Qc9d9X3qh2EqIqtn/72iY17OMDXAOINDC10hARNAc4w=\n  * host: mobilizon1.com\n  * signature: keyId=\"http://mobilizon.test/relay#main-key\",algorithm=\"rsa-sha256\",headers=\"(request-target) content-length date digest host\",signature=\"JQPqSiJ0ZYdU6llrYXNMuN/bfzoLyubwOB59bljFq6i8ORXLw62Pt7Jue5WkMsySFcCXgS8k8K/H81YZkKzfWadwQV9L5rQEFSuW/DYJ2xffsDj90GsSi+sDRaQ5Ke8nPEbEMGR9jalh/F2VL97XscCgm6i3tdpbs6aFmqjKC+LzeH665t0WCHUxTgK47wECrMHw3j7lteGdm6N6IKWoWsRYeJoyFr/QCbNdWQOaAYYpCbJd0fjhPQRHhWQXidBoaDkhwesWc3mO8pvEnply9ES7Nzc6ULK7B98hg+aWeep8/KzRbxFyJ0OgnDJj/l39QiJ9t7v0yHX/WUzn0CaiiQ==\"\n  * user-agent: hackney/1.15.2\n  * x-forwarded-for: 127.0.0.1\n  * x-real-ip: 127.0.0.1\n\n### Session\n\n    %{}\n",
+      "body": "# HTTPoison.Error at POST /inbox\n\nException:\n\n    ** (HTTPoison.Error) :nxdomain\n        (httpoison) lib/httpoison.ex:128: HTTPoison.request!/5\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:610: Mobilizon.Service.ActivityPub.fetch_and_prepare_actor_from_url/1\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:473: Mobilizon.Service.ActivityPub.make_actor_from_url/2\n        (mobilizon) lib/service/activity_pub/activity_pub.ex:122: Mobilizon.Service.ActivityPub.get_or_fetch_actor_by_url/2\n        (mobilizon) lib/service/http_signatures/signature.ex:54: Mobilizon.Service.HTTPSignatures.Signature.get_public_key_for_url/1\n        (mobilizon) lib/service/http_signatures/signature.ex:74: Mobilizon.Service.HTTPSignatures.Signature.fetch_public_key/1\n        (http_signatures) lib/http_signatures/http_signatures.ex:40: HTTPSignatures.validate_conn/1\n        (mobilizon) lib/mobilizon_web/http_signature.ex:45: Mobilizon.Web.HTTPSignaturePlug.call/2\n        (mobilizon) Mobilizon.Web.Router.activity_pub_signature/2\n        (mobilizon) lib/mobilizon_web/router.ex:1: Mobilizon.Web.Router.__pipe_through7__/1\n        (phoenix) lib/phoenix/router.ex:283: Phoenix.Router.__call__/2\n        (mobilizon) lib/mobilizon_web/endpoint.ex:1: Mobilizon.Web.Endpoint.plug_builder_call/2\n        (mobilizon) lib/plug/debugger.ex:122: Mobilizon.Web.Endpoint.\"call (overridable 3)\"/2\n        (mobilizon) lib/mobilizon_web/endpoint.ex:1: Mobilizon.Web.Endpoint.call/2\n        (phoenix) lib/phoenix/endpoint/cowboy2_handler.ex:42: Phoenix.Endpoint.Cowboy2Handler.init/4\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_handler.erl:41: :cowboy_handler.execute/2\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_stream_h.erl:320: :cowboy_stream_h.execute/3\n        (cowboy) /home/tcit/dev/frama/mobilizon/deps/cowboy/src/cowboy_stream_h.erl:302: :cowboy_stream_h.request_process/3\n        (stdlib) proc_lib.erl:249: :proc_lib.init_p_do_apply/3\n    \n\n## Connection details\n\n### Params\n\n    %{\"@context\" => [\"https://www.w3.org/ns/activitystreams\", \"https://litepub.social/litepub/context.jsonld\", %{\"Hashtag\" => \"as:Hashtag\", \"category\" => \"sc:category\", \"ical\" => \"http://www.w3.org/2002/12/cal/ical#\", \"joinMode\" => %{\"@id\" => \"mz:joinMode\", \"@type\" => \"mz:joinModeType\"}, \"joinModeType\" => %{\"@id\" => \"mz:joinModeType\", \"@type\" => \"rdfs:Class\"}, \"maximumAttendeeCapacity\" => \"sc:maximumAttendeeCapacity\", \"mz\" => \"https://joinmobilizon.org/ns#\", \"repliesModerationOption\" => %{\"@id\" => \"mz:repliesModerationOption\", \"@type\" => \"mz:repliesModerationOptionType\"}, \"repliesModerationOptionType\" => %{\"@id\" => \"mz:repliesModerationOptionType\", \"@type\" => \"rdfs:Class\"}, \"sc\" => \"http://schema.org#\", \"uuid\" => \"sc:identifier\"}], \"actor\" => \"http://mobilizon.test/relay\", \"cc\" => [\"https://www.w3.org/ns/activitystreams#Public\"], \"id\" => \"http://mobilizon.test/follow/57a6973e-f43f-4533-bf71-7a14a4c6e5ac\", \"object\" => \"http://mobilizon1.com/relay\", \"to\" => [\"http://mobilizon1.com/relay\"], \"type\" => \"Follow\"}\n\n### Request info\n\n  * URI: http://mobilizon1.com:80/inbox\n  * Query string: \n\n### Headers\n  \n  * connection: upgrade\n  * content-length: 912\n  * content-type: application/activity+json\n  * date: Fri, 13 Dec 2019 09:41:40 GMT\n  * digest: SHA-256=Qc9d9X3qh2EqIqtn/72iY17OMDXAOINDC10hARNAc4w=\n  * host: mobilizon1.com\n  * signature: keyId=\"http://mobilizon.test/relay#main-key\",algorithm=\"rsa-sha256\",headers=\"(request-target) content-length date digest host\",signature=\"JQPqSiJ0ZYdU6llrYXNMuN/bfzoLyubwOB59bljFq6i8ORXLw62Pt7Jue5WkMsySFcCXgS8k8K/H81YZkKzfWadwQV9L5rQEFSuW/DYJ2xffsDj90GsSi+sDRaQ5Ke8nPEbEMGR9jalh/F2VL97XscCgm6i3tdpbs6aFmqjKC+LzeH665t0WCHUxTgK47wECrMHw3j7lteGdm6N6IKWoWsRYeJoyFr/QCbNdWQOaAYYpCbJd0fjhPQRHhWQXidBoaDkhwesWc3mO8pvEnply9ES7Nzc6ULK7B98hg+aWeep8/KzRbxFyJ0OgnDJj/l39QiJ9t7v0yHX/WUzn0CaiiQ==\"\n  * user-agent: hackney/1.15.2\n  * x-forwarded-for: 127.0.0.1\n  * x-real-ip: 127.0.0.1\n\n### Session\n\n    %{}\n",
      "headers": {
        "Server": "nginx/1.16.1",
        "Date": "Fri, 13 Dec 2019 09:41:40 GMT",
--- a/test/graphql/resolvers/address_test.exs
+++ b/test/graphql/resolvers/address_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.AddressTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

--- a/test/graphql/resolvers/admin_test.exs
+++ b/test/graphql/resolvers/admin_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

--- a/test/graphql/resolvers/comment_test.exs
+++ b/test/graphql/resolvers/comment_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.CommentTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

--- a/test/graphql/resolvers/config_test.exs
+++ b/test/graphql/resolvers/config_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.ConfigTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase
  use Bamboo.Test

  alias Mobilizon.GraphQL.AbsintheHelpers
--- a/test/graphql/resolvers/event_test.exs
+++ b/test/graphql/resolvers/event_test.exs
@@ -1,5 +1,5 @@
-defmodule MobilizonWeb.Resolvers.EventTest do
-  use MobilizonWeb.ConnCase
+defmodule Mobilizon.Web.Resolvers.EventTest do
+  use Mobilizon.Web.ConnCase
  use Bamboo.Test
  use Oban.Testing, repo: Mobilizon.Storage.Repo

@@ -10,7 +10,7 @@ defmodule MobilizonWeb.Resolvers.EventTest do

  alias Mobilizon.GraphQL.AbsintheHelpers

-  alias MobilizonWeb.Email
+  alias Mobilizon.Web.Email

  @event %{
    description: "some body",
--- a/test/graphql/resolvers/feed_token_test.exs
+++ b/test/graphql/resolvers/feed_token_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.FeedTokenTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

--- a/test/graphql/resolvers/group_test.exs
+++ b/test/graphql/resolvers/group_test.exs
@@ -1,5 +1,5 @@
-defmodule MobilizonWeb.Resolvers.GroupTest do
-  use MobilizonWeb.ConnCase
+defmodule Mobilizon.Web.Resolvers.GroupTest do
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

--- a/test/graphql/resolvers/member_test.exs
+++ b/test/graphql/resolvers/member_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.MemberTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

--- a/test/graphql/resolvers/participant_test.exs
+++ b/test/graphql/resolvers/participant_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.ParticipantTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase
  use Bamboo.Test

  import Mobilizon.Factory
@@ -7,7 +7,7 @@ defmodule Mobilizon.GraphQL.Resolvers.ParticipantTest do
  alias Mobilizon.Events
  alias Mobilizon.GraphQL.AbsintheHelpers

-  alias MobilizonWeb.Email
+  alias Mobilizon.Web.Email

  @event %{
    description: "some body",
--- a/test/graphql/resolvers/person_test.exs
+++ b/test/graphql/resolvers/person_test.exs
@@ -1,6 +1,6 @@
 defmodule Mobilizon.GraphQL.Resolvers.PersonTest do
  use Oban.Testing, repo: Mobilizon.Storage.Repo
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

@@ -121,7 +121,7 @@ defmodule Mobilizon.GraphQL.Resolvers.PersonTest do
               actor.preferred_username

      assert json_response(res, 200)["data"]["loggedPerson"]["avatar"]["url"] =~
-               MobilizonWeb.Endpoint.url()
+               Mobilizon.Web.Endpoint.url()
    end

    test "create_person/3 creates a new identity", context do
@@ -255,7 +255,7 @@ defmodule Mobilizon.GraphQL.Resolvers.PersonTest do
               "The beautiful atlantic way"

      assert json_response(res, 200)["data"]["createPerson"]["banner"]["url"] =~
-               MobilizonWeb.Endpoint.url() <> "/media/"
+               Mobilizon.Web.Endpoint.url() <> "/media/"
    end

    test "update_person/3 updates an existing identity", context do
@@ -325,7 +325,7 @@ defmodule Mobilizon.GraphQL.Resolvers.PersonTest do

      assert res_person["banner"]["id"]
      assert res_person["banner"]["name"] == "The beautiful atlantic way"
-      assert res_person["banner"]["url"] =~ MobilizonWeb.Endpoint.url() <> "/media/"
+      assert res_person["banner"]["url"] =~ Mobilizon.Web.Endpoint.url() <> "/media/"
    end

    test "update_person/3 should fail to update a not owned identity", context do
--- a/test/graphql/resolvers/picture_test.exs
+++ b/test/graphql/resolvers/picture_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.PictureTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase
  use Bamboo.Test

  import Mobilizon.Factory
@@ -43,7 +43,7 @@ defmodule Mobilizon.GraphQL.Resolvers.PictureTest do
      assert json_response(res, 200)["data"]["picture"]["size"] == 13_120

      assert json_response(res, 200)["data"]["picture"]["url"] =~
-               MobilizonWeb.Endpoint.url()
+               Mobilizon.Web.Endpoint.url()
    end

    test "picture/3 returns nothing on a non-existent picture", context do
--- a/test/graphql/resolvers/report_test.exs
+++ b/test/graphql/resolvers/report_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.ReportTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

--- a/test/graphql/resolvers/search_test.exs
+++ b/test/graphql/resolvers/search_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.SearchTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

--- a/test/graphql/resolvers/tag_test.exs
+++ b/test/graphql/resolvers/tag_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.TagTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

--- a/test/graphql/resolvers/user_test.exs
+++ b/test/graphql/resolvers/user_test.exs
@@ -1,5 +1,5 @@
 defmodule Mobilizon.GraphQL.Resolvers.UserTest do
-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase
  use Bamboo.Test

  import Mobilizon.Factory
@@ -10,7 +10,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do

  alias Mobilizon.GraphQL.AbsintheHelpers

-  alias MobilizonWeb.Email
+  alias Mobilizon.Web.Email

  @valid_actor_params %{email: "test@test.tld", password: "testest", username: "test"}
  @valid_single_actor_params %{preferred_username: "test2", keys: "yolo"}
--- a/test/mobilizon/actors/actors_test.exs
+++ b/test/mobilizon/actors/actors_test.exs
@@ -14,7 +14,7 @@ defmodule Mobilizon.ActorsTest do

  alias Mobilizon.Federation.ActivityPub

-  alias MobilizonWeb.Upload.Uploader
+  alias Mobilizon.Web.Upload.Uploader

  describe "actors" do
    @valid_attrs %{
@@ -258,7 +258,7 @@ defmodule Mobilizon.ActorsTest do
        filename: "image.jpg"
      }

-      {:ok, data} = MobilizonWeb.Upload.store(file)
+      {:ok, data} = Mobilizon.Web.Upload.store(file)

      assert {:ok, actor} =
               Actors.update_actor(
--- a/test/mobilizon/media/media_test.exs
+++ b/test/mobilizon/media/media_test.exs
@@ -5,7 +5,7 @@ defmodule Mobilizon.MediaTest do

  alias Mobilizon.{Config, Media}

-  alias MobilizonWeb.Upload.Uploader
+  alias Mobilizon.Web.Upload.Uploader

  describe "media" do
    setup [:ensure_local_uploader]
--- a/test/mobilizon_web/views/error_view_test.exs
+++ b/test/mobilizon_web/views/error_view_test.exs
@@ -1,19 +0,0 @@
-defmodule MobilizonWeb.ErrorViewTest do
-  use MobilizonWeb.ConnCase, async: true
-
-  # Bring render/3 and render_to_string/3 for testing custom views
-  import Phoenix.View
-
-  test "renders 404.html" do
-    assert render_to_string(MobilizonWeb.ErrorView, "404.html", []) =~
-             "We're sorry but mobilizon doesn't work properly without JavaScript enabled. Please enable it to continue."
-  end
-
-  test "render 500.html" do
-    assert render_to_string(MobilizonWeb.ErrorView, "500.html", []) == "Internal server error"
-  end
-
-  test "render any other" do
-    assert render_to_string(MobilizonWeb.ErrorView, "505.html", []) == "Internal server error"
-  end
-end
--- a/test/mobilizon_web/views/layout_view_test.exs
+++ b/test/mobilizon_web/views/layout_view_test.exs
@@ -1,3 +0,0 @@
-defmodule MobilizonWeb.LayoutViewTest do
-  use MobilizonWeb.ConnCase, async: true
-end
--- a/test/mobilizon_web/views/page_view_test.exs
+++ b/test/mobilizon_web/views/page_view_test.exs
@@ -1,3 +0,0 @@
-defmodule MobilizonWeb.PageViewTest do
-  use MobilizonWeb.ConnCase, async: true
-end
--- a/test/support/abinthe_helpers.ex
+++ b/test/support/abinthe_helpers.ex
@@ -5,7 +5,7 @@ defmodule Mobilizon.GraphQL.AbsintheHelpers do

  use Phoenix.ConnTest

-  @endpoint MobilizonWeb.Endpoint
+  @endpoint Mobilizon.Web.Endpoint

  def query_skeleton(query, query_name) do
    %{
--- a/test/support/channel_case.ex
+++ b/test/support/channel_case.ex
@@ -1,4 +1,4 @@
-defmodule MobilizonWeb.ChannelCase do
+defmodule Mobilizon.Web.ChannelCase do
  @moduledoc """
  This module defines the test case to be used by
  channel tests.
@@ -25,7 +25,7 @@ defmodule MobilizonWeb.ChannelCase do
      use Phoenix.ChannelTest

      # The default endpoint for testing
-      @endpoint MobilizonWeb.Endpoint
+      @endpoint Mobilizon.Web.Endpoint
    end
  end

--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -1,4 +1,4 @@
-defmodule MobilizonWeb.ConnCase do
+defmodule Mobilizon.Web.ConnCase do
  @moduledoc """
  This module defines the test case to be used by
  tests that require setting up a connection.
@@ -24,13 +24,13 @@ defmodule MobilizonWeb.ConnCase do
    quote do
      # Import conveniences for testing with connections
      use Phoenix.ConnTest
-      import MobilizonWeb.Router.Helpers
+      import Mobilizon.Web.Router.Helpers

      # The default endpoint for testing
-      @endpoint MobilizonWeb.Endpoint
+      @endpoint Mobilizon.Web.Endpoint

      def auth_conn(%Plug.Conn{} = conn, %User{} = user) do
-        {:ok, token, _claims} = MobilizonWeb.Auth.Guardian.encode_and_sign(user)
+        {:ok, token, _claims} = Mobilizon.Web.Auth.Guardian.encode_and_sign(user)

        conn
        |> Plug.Conn.put_req_header("authorization", "Bearer #{token}")
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -19,8 +19,8 @@ defmodule Mobilizon.DataCase do
  alias Mobilizon.Config
  alias Mobilizon.Storage.Repo

-  alias MobilizonWeb.Upload
-  alias MobilizonWeb.Upload.Uploader
+  alias Mobilizon.Web.Upload
+  alias Mobilizon.Web.Upload.Uploader

  using do
    quote do
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -8,9 +8,9 @@ defmodule Mobilizon.Factory do
  alias Mobilizon.Actors.Actor
  alias Mobilizon.Crypto

-  alias MobilizonWeb.Endpoint
-  alias MobilizonWeb.Router.Helpers, as: Routes
-  alias MobilizonWeb.Upload
+  alias Mobilizon.Web.Endpoint
+  alias Mobilizon.Web.Router.Helpers, as: Routes
+  alias Mobilizon.Web.Upload

  def user_factory do
    %Mobilizon.Users.User{
@@ -60,7 +60,7 @@ defmodule Mobilizon.Factory do
      target_actor: build(:actor),
      actor: build(:actor),
      id: uuid,
-      url: "#{MobilizonWeb.Endpoint.url()}/follows/#{uuid}"
+      url: "#{Mobilizon.Web.Endpoint.url()}/follows/#{uuid}"
    }
  end

--- a/test/mobilizon_web/controllers/activity_pub_controller_test.exs
+++ b/test/mobilizon_web/controllers/activity_pub_controller_test.exs
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/test/web/web_finger/web_finger_controller_test.exs

-defmodule MobilizonWeb.ActivityPubControllerTest do
+defmodule Mobilizon.Web.ActivityPubControllerTest do
  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney

-  use MobilizonWeb.ConnCase
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

@@ -15,10 +15,10 @@ defmodule MobilizonWeb.ActivityPubControllerTest do

  alias Mobilizon.Federation.ActivityPub

-  alias MobilizonWeb.ActivityPub.ActorView
-  alias MobilizonWeb.Endpoint
-  alias MobilizonWeb.PageView
-  alias MobilizonWeb.Router.Helpers, as: Routes
+  alias Mobilizon.Web.ActivityPub.ActorView
+  alias Mobilizon.Web.Endpoint
+  alias Mobilizon.Web.PageView
+  alias Mobilizon.Web.Router.Helpers, as: Routes

  setup_all do
    Mobilizon.Config.put([:instance, :federating], true)
@@ -104,7 +104,7 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
        conn =
          conn
          |> assign(:valid_signature, true)
-          |> post("#{MobilizonWeb.Endpoint.url()}/inbox", data)
+          |> post("#{Mobilizon.Web.Endpoint.url()}/inbox", data)

        assert "ok" == json_response(conn, 200)
        :timer.sleep(500)
--- a/test/mobilizon_web/controllers/feed_controller_test.exs
+++ b/test/mobilizon_web/controllers/feed_controller_test.exs
@@ -1,10 +1,10 @@
-defmodule MobilizonWeb.FeedControllerTest do
-  use MobilizonWeb.ConnCase
+defmodule Mobilizon.Web.FeedControllerTest do
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

-  alias MobilizonWeb.Endpoint
-  alias MobilizonWeb.Router.Helpers, as: Routes
+  alias Mobilizon.Web.Endpoint
+  alias Mobilizon.Web.Router.Helpers, as: Routes

  describe "/@:preferred_username/feed/atom" do
    test "it returns an RSS representation of the actor's public events if the actor is publicly visible",
--- a/test/mobilizon_web/controllers/nodeinfo_controller_test.exs
+++ b/test/mobilizon_web/controllers/nodeinfo_controller_test.exs
@@ -1,10 +1,10 @@
-defmodule MobilizonWeb.NodeInfoControllerTest do
-  use MobilizonWeb.ConnCase
+defmodule Mobilizon.Web.NodeInfoControllerTest do
+  use Mobilizon.Web.ConnCase

  alias Mobilizon.Config

-  alias MobilizonWeb.Endpoint
-  alias MobilizonWeb.Router.Helpers, as: Routes
+  alias Mobilizon.Web.Endpoint
+  alias Mobilizon.Web.Router.Helpers, as: Routes

  test "Get node info schemas", %{conn: conn} do
    conn = get(conn, node_info_path(conn, :schemas))
--- a/test/mobilizon_web/controllers/page_controller_test.exs
+++ b/test/mobilizon_web/controllers/page_controller_test.exs
@@ -1,12 +1,12 @@
-defmodule MobilizonWeb.PageControllerTest do
-  use MobilizonWeb.ConnCase
+defmodule Mobilizon.Web.PageControllerTest do
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

  alias Mobilizon.Actors.Actor

-  alias MobilizonWeb.Endpoint
-  alias MobilizonWeb.Router.Helpers, as: Routes
+  alias Mobilizon.Web.Endpoint
+  alias Mobilizon.Web.Router.Helpers, as: Routes

  setup do
    conn = build_conn() |> put_req_header("accept", "text/html")
--- a/test/mobilizon_web/controllers/webfinger_controller_test.exs
+++ b/test/mobilizon_web/controllers/webfinger_controller_test.exs
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/test/web/web_finger/web_finger_test.exs

-defmodule MobilizonWeb.WebFingerControllerTest do
-  use MobilizonWeb.ConnCase
+defmodule Mobilizon.Web.WebFingerControllerTest do
+  use Mobilizon.Web.ConnCase

  import Mobilizon.Factory

@@ -22,7 +22,7 @@ defmodule MobilizonWeb.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=\"#{
-               MobilizonWeb.Endpoint.url()
+               Mobilizon.Web.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
--- a/test/mobilizon_web/plugs/federating_test.exs
+++ b/test/mobilizon_web/plugs/federating_test.exs
@@ -3,10 +3,10 @@
 # Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only

-defmodule MobilizonWeb.Plug.FederatingTest do
-  use MobilizonWeb.ConnCase
+defmodule Mobilizon.Web.Plug.FederatingTest do
+  use Mobilizon.Web.ConnCase

-  alias MobilizonWeb.Plugs.Federating
+  alias Mobilizon.Web.Plugs.Federating

  test "returns and halt the conn when federating is disabled" do
    Mobilizon.Config.put([:instance, :federating], false)
--- a/test/mobilizon_web/plugs/mapped_identity_to_signature_test.exs
+++ b/test/mobilizon_web/plugs/mapped_identity_to_signature_test.exs
@@ -3,11 +3,11 @@
 # Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only

-defmodule MobilizonWeb.Plugs.MappedSignatureToIdentityTest do
-  use MobilizonWeb.ConnCase
+defmodule Mobilizon.Web.Plugs.MappedSignatureToIdentityTest do
+  use Mobilizon.Web.ConnCase
  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney

-  alias MobilizonWeb.Plugs.MappedSignatureToIdentity
+  alias Mobilizon.Web.Plugs.MappedSignatureToIdentity

  defp set_signature(conn, key_id) do
    conn
--- a/test/mobilizon_web/plugs/uploaded_media_test.exs
+++ b/test/mobilizon_web/plugs/uploaded_media_test.exs
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/test/plugs/uploaded_media_plug_test.ex

-defmodule MobilizonWeb.Plugs.UploadedMediaPlugTest do
-  use MobilizonWeb.ConnCase
-  alias MobilizonWeb.Upload
+defmodule Mobilizon.Web.Plugs.UploadedMediaPlugTest do
+  use Mobilizon.Web.ConnCase
+  alias Mobilizon.Web.Upload

  defp upload_file(context) do
    Mobilizon.DataCase.ensure_local_uploader(context)
--- a/test/mobilizon_web/proxy/media_proxy_test.exs
+++ b/test/mobilizon_web/proxy/media_proxy_test.exs
@@ -3,14 +3,14 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/test/media_proxy_test.ex

-defmodule MobilizonWeb.MediaProxyTest do
+defmodule Mobilizon.Web.MediaProxyTest do
  use ExUnit.Case

-  import MobilizonWeb.MediaProxy
+  import Mobilizon.Web.MediaProxy

  alias Mobilizon.Config

-  alias MobilizonWeb.MediaProxyController
+  alias Mobilizon.Web.MediaProxyController

  setup do
    enabled = Config.get([:media_proxy, :enabled])
@@ -35,8 +35,8 @@ defmodule MobilizonWeb.MediaProxyTest do
    end

    test "ignores local url" do
-      local_url = MobilizonWeb.Endpoint.url() <> "/hello"
-      local_root = MobilizonWeb.Endpoint.url()
+      local_url = Mobilizon.Web.Endpoint.url() <> "/hello"
+      local_root = Mobilizon.Web.Endpoint.url()
      assert url(local_url) == local_url
      assert url(local_root) == local_root
    end
@@ -47,7 +47,7 @@ defmodule MobilizonWeb.MediaProxyTest do

      assert String.starts_with?(
               encoded,
-               Config.get([:media_proxy, :base_url], MobilizonWeb.Endpoint.url())
+               Config.get([:media_proxy, :base_url], Mobilizon.Web.Endpoint.url())
             )

      assert String.ends_with?(encoded, "/logo.png")
@@ -84,16 +84,16 @@ defmodule MobilizonWeb.MediaProxyTest do
    end

    test "validates signature" do
-      secret_key_base = Config.get([MobilizonWeb.Endpoint, :secret_key_base])
+      secret_key_base = Config.get([Mobilizon.Web.Endpoint, :secret_key_base])

      on_exit(fn ->
-        Config.put([MobilizonWeb.Endpoint, :secret_key_base], secret_key_base)
+        Config.put([Mobilizon.Web.Endpoint, :secret_key_base], secret_key_base)
      end)

      encoded = url("https://pleroma.social")

      Config.put(
-        [MobilizonWeb.Endpoint, :secret_key_base],
+        [Mobilizon.Web.Endpoint, :secret_key_base],
        "00000000000000000000000000000000000000000000000"
      )

--- a/test/mobilizon_web/upload/upload_test.exs
+++ b/test/mobilizon_web/upload/upload_test.exs
@@ -8,8 +8,8 @@ defmodule Mobilizon.UploadTest do

  alias Mobilizon.Config

-  alias MobilizonWeb.Upload
-  alias MobilizonWeb.Upload.Uploader
+  alias Mobilizon.Web.Upload
+  alias Mobilizon.Web.Upload.Uploader

  describe "Storing a file with the Local uploader" do
    setup [:ensure_local_uploader]
@@ -31,7 +31,7 @@ defmodule Mobilizon.UploadTest do
               size: 13_227
             } = data

-      assert String.starts_with?(url, MobilizonWeb.Endpoint.url() <> "/media/")
+      assert String.starts_with?(url, Mobilizon.Web.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: [MobilizonWeb.Upload.Filter.Dedupe])
+      {:ok, data} = Upload.store(file, filters: [Mobilizon.Web.Upload.Filter.Dedupe])

      assert data.url ==
-               MobilizonWeb.Endpoint.url() <>
+               Mobilizon.Web.Endpoint.url() <>
                 "/media/590523d60d3831ec92d05cdd871078409d5780903910efec5cd35ab1b0f19d11.jpg"
    end

@@ -88,7 +88,7 @@ defmodule Mobilizon.UploadTest do
        filename: "an [image.jpg"
      }

-      {:ok, data} = Upload.store(file, filters: [MobilizonWeb.Upload.Filter.Dedupe])
+      {:ok, data} = Upload.store(file, filters: [Mobilizon.Web.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: [MobilizonWeb.Upload.Filter.AnonymizeFilename])
+      {:ok, data} = Upload.store(file, filters: [Mobilizon.Web.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, MobilizonWeb.Endpoint.url() <> "/media/")
+    assert String.starts_with?(url, Mobilizon.Web.Endpoint.url() <> "/media/")

    %URI{path: "/media/" <> path} = URI.parse(url)
    {Config.get!([Uploader.Local, :uploads]) <> "/" <> path, url}
--- a/test/web/views/error_view_test.exs
+++ b/test/web/views/error_view_test.exs
@@ -0,0 +1,19 @@
+defmodule Mobilizon.Web.ErrorViewTest do
+  use Mobilizon.Web.ConnCase, async: true
+
+  # Bring render/3 and render_to_string/3 for testing custom views
+  import Phoenix.View
+
+  test "renders 404.html" do
+    assert render_to_string(Mobilizon.Web.ErrorView, "404.html", []) =~
+             "We're sorry but mobilizon doesn't work properly without JavaScript enabled. Please enable it to continue."
+  end
+
+  test "render 500.html" do
+    assert render_to_string(Mobilizon.Web.ErrorView, "500.html", []) == "Internal server error"
+  end
+
+  test "render any other" do
+    assert render_to_string(Mobilizon.Web.ErrorView, "505.html", []) == "Internal server error"
+  end
+end
--- a/test/web/views/layout_view_test.exs
+++ b/test/web/views/layout_view_test.exs
@@ -0,0 +1,3 @@
+defmodule Mobilizon.Web.LayoutViewTest do
+  use Mobilizon.Web.ConnCase, async: true
+end
--- a/test/web/views/page_view_test.exs
+++ b/test/web/views/page_view_test.exs
@@ -0,0 +1,3 @@
+defmodule Mobilizon.Web.PageViewTest do
+  use Mobilizon.Web.ConnCase, async: true
+end