Fix code readability issues

test/mobilizon/actors/actors_test.exs

@@ -6,7 +6,7 @@ defmodule Mobilizon.ActorsTest do
   import Mobilizon.Factory
 
   alias Mobilizon.{Actors, Config, Users}
-  alias Mobilizon.Actors.{Actor, Member, Follower, Bot}
+  alias Mobilizon.Actors.{Actor, Bot, Follower, Member}
   alias Mobilizon.Media.File, as: FileModel
   alias Mobilizon.Service.ActivityPub
   alias Mobilizon.Storage.Page
@@ -311,9 +311,6 @@ defmodule Mobilizon.ActorsTest do
   end
 
   describe "groups" do
-    alias Mobilizon.Actors
-    alias Mobilizon.Actors.Actor
-
     @valid_attrs %{
       summary: "some description",
       suspended: true,
@@ -356,11 +353,7 @@ defmodule Mobilizon.ActorsTest do
     end
   end
 
-  alias Mobilizon.Actors
-
   describe "bots" do
-    alias Mobilizon.Actors.Bot
-
     @valid_attrs %{source: "some source", type: "some type"}
     @update_attrs %{source: "some updated source", type: "some updated type"}
     @invalid_attrs %{source: nil, type: nil}
@@ -419,9 +412,6 @@ defmodule Mobilizon.ActorsTest do
   end
 
   describe "followers" do
-    alias Mobilizon.Actors.Follower
-    alias Mobilizon.Actors.Actor
-
     @valid_attrs %{approved: true}
     @update_attrs %{approved: false}
     @invalid_attrs %{approved: nil}
@@ -529,9 +519,6 @@ defmodule Mobilizon.ActorsTest do
   end
 
   describe "members" do
-    alias Mobilizon.Actors.Member
-    alias Mobilizon.Actors.Actor
-
     @valid_attrs %{role: :member}
     @update_attrs %{role: :not_approved}
     @invalid_attrs %{role: nil}

test/mobilizon/events/events_test.exs

@@ -3,7 +3,9 @@ defmodule Mobilizon.EventsTest do
 
   import Mobilizon.Factory
 
+  alias Mobilizon.Actors.Actor
   alias Mobilizon.Events
+  alias Mobilizon.Events.{Comment, Event, Participant, Session, Tag, TagRelation, Track}
   alias Mobilizon.Storage.Page
 
   @event_valid_attrs %{
@@ -17,8 +19,6 @@ defmodule Mobilizon.EventsTest do
   }
 
   describe "events" do
-    alias Mobilizon.Events.Event
-
     setup do
       actor = insert(:actor)
       event = insert(:event, organizer_actor: actor, visibility: :public)
@@ -176,8 +176,6 @@ defmodule Mobilizon.EventsTest do
   end
 
   describe "tags" do
-    alias Mobilizon.Events.Tag
-
     @valid_attrs %{title: "some title"}
     @update_attrs %{title: "some updated title"}
     @invalid_attrs %{title: nil}
@@ -227,9 +225,6 @@ defmodule Mobilizon.EventsTest do
   end
 
   describe "tags_relations" do
-    alias Mobilizon.Events.TagRelation
-    alias Mobilizon.Events.Tag
-
     setup do
       tag1 = insert(:tag)
       tag2 = insert(:tag)
@@ -302,9 +297,6 @@ defmodule Mobilizon.EventsTest do
   end
 
   describe "participants" do
-    alias Mobilizon.Events.{Participant, Event}
-    alias Mobilizon.Actors.Actor
-
     @valid_attrs %{role: :creator}
     @update_attrs %{role: :moderator}
     @invalid_attrs %{role: :no_such_role}
@@ -369,8 +361,6 @@ defmodule Mobilizon.EventsTest do
   end
 
   describe "sessions" do
-    alias Mobilizon.Events.Session
-
     @valid_attrs %{
       audios_urls: "some audios_urls",
       language: "some language",
@@ -463,8 +453,6 @@ defmodule Mobilizon.EventsTest do
   end
 
   describe "tracks" do
-    alias Mobilizon.Events.Track
-
     @valid_attrs %{color: "some color", description: "some description", name: "some name"}
     @update_attrs %{
       color: "some updated color",
@@ -525,8 +513,6 @@ defmodule Mobilizon.EventsTest do
   end
 
   describe "comments" do
-    alias Mobilizon.Events.Comment
-
     @valid_attrs %{text: "some text"}
     @update_attrs %{text: "some updated text"}
     @invalid_attrs %{text: nil, url: nil}

test/mobilizon/service/activity_pub/activity_pub_test.exs

@@ -4,17 +4,19 @@
 # Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/test/web/activity_pub/activity_pub_test.exs
 
 defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
+  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
   use Mobilizon.DataCase
 
+  import Mock
+
   import Mobilizon.Factory
 
+  alias Mobilizon.Actors.Actor
   alias Mobilizon.Events
   alias Mobilizon.Events.Event
-  alias Mobilizon.Actors.Actor
-  alias Mobilizon.Service.HTTPSignatures.Signature
   alias Mobilizon.Service.ActivityPub
-  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
-  import Mock
+  alias Mobilizon.Service.HTTPSignatures.Signature
 
   setup_all do
     HTTPoison.start()

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

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

test/mobilizon/service/activity_pub/transmogrifier_test.exs

@@ -4,6 +4,8 @@
 # Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/test/web/activity_pub/transmogrifier_test.exs
 
 defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
+  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
   use Mobilizon.DataCase
 
   import Mobilizon.Factory
@@ -13,9 +15,8 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
   alias Mobilizon.Events
   alias Mobilizon.Events.{Comment, Event, Participant}
   alias Mobilizon.Service.ActivityPub
-  alias Mobilizon.Service.ActivityPub.{Utils, Activity}
+  alias Mobilizon.Service.ActivityPub.{Activity, Utils}
   alias Mobilizon.Service.ActivityPub.Transmogrifier
-  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
 
   setup_all do
     HTTPoison.start()

test/mobilizon/service/activity_pub/utils_test.exs

@@ -1,10 +1,14 @@
 defmodule Mobilizon.Service.ActivityPub.UtilsTest do
-  use Mobilizon.DataCase
-  import Mobilizon.Factory
-  alias Mobilizon.Service.ActivityPub.Utils
   use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
-  alias MobilizonWeb.Router.Helpers, as: Routes
+
+  use Mobilizon.DataCase
+
+  import Mobilizon.Factory
+
+  alias Mobilizon.Service.ActivityPub.Utils
+
   alias MobilizonWeb.Endpoint
+  alias MobilizonWeb.Router.Helpers, as: Routes
 
   setup_all do
     HTTPoison.start()

test/mobilizon/service/admin/action_log_service_test.exs

@@ -1,12 +1,15 @@
 defmodule Mobilizon.Service.Admin.ActionLogServiceTest do
   @moduledoc """
-  Test the ActionLogService module
+  Test the ActionLogService module.
   """
+
   use Mobilizon.DataCase
-  import Mobilizon.Service.Admin.ActionLogService
-  alias Mobilizon.Reports.{Report, Note}
-  alias Mobilizon.Admin.ActionLog
+
   import Mobilizon.Factory
+  import Mobilizon.Service.Admin.ActionLogService
+
+  alias Mobilizon.Admin.ActionLog
+  alias Mobilizon.Reports.{Note, Report}
 
   setup do
     moderator_user = insert(:user, role: :moderator)

test/mobilizon/service/geospatial/addok_test.exs

@@ -1,13 +1,14 @@
 defmodule Mobilizon.Service.Geospatial.AddokTest do
-  use Mobilizon.DataCase, async: false
-  alias Mobilizon.Service.Geospatial.Addok
-  alias Mobilizon.Addresses.Address
-
-  import Mock
   use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
 
-  @endpoint Application.get_env(:mobilizon, Mobilizon.Service.Geospatial.Addok)
-            |> get_in([:endpoint])
+  use Mobilizon.DataCase, async: false
+
+  import Mock
+
+  alias Mobilizon.Addresses.Address
+  alias Mobilizon.Service.Geospatial.Addok
+
+  @endpoint get_in(Application.get_env(:mobilizon, Addok), [:endpoint])
   @fake_endpoint "https://domain.tld"
 
   describe "search address" do

test/mobilizon/service/geospatial/google_maps_test.exs

@@ -1,10 +1,12 @@
 defmodule Mobilizon.Service.Geospatial.GoogleMapsTest do
+  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
   use Mobilizon.DataCase, async: false
-  alias Mobilizon.Service.Geospatial.GoogleMaps
-  alias Mobilizon.Addresses.Address
 
   import Mock
-  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
+  alias Mobilizon.Addresses.Address
+  alias Mobilizon.Service.Geospatial.GoogleMaps
 
   describe "search address" do
     test "without API Key triggers an error" do

test/mobilizon/service/geospatial/map_quest_test.exs

@@ -1,10 +1,12 @@
 defmodule Mobilizon.Service.Geospatial.MapQuestTest do
+  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
   use Mobilizon.DataCase, async: false
-  alias Mobilizon.Service.Geospatial.MapQuest
-  alias Mobilizon.Addresses.Address
 
   import Mock
-  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
+  alias Mobilizon.Addresses.Address
+  alias Mobilizon.Service.Geospatial.MapQuest
 
   describe "search address" do
     test "without API Key triggers an error" do

test/mobilizon/service/geospatial/nominatim_test.exs

@@ -1,10 +1,12 @@
 defmodule Mobilizon.Service.Geospatial.NominatimTest do
+  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
   use Mobilizon.DataCase, async: false
-  alias Mobilizon.Service.Geospatial.Nominatim
-  alias Mobilizon.Addresses.Address
 
   import Mock
-  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
+  alias Mobilizon.Addresses.Address
+  alias Mobilizon.Service.Geospatial.Nominatim
 
   describe "search address" do
     test "produces a valid search address with options" do

test/mobilizon/service/geospatial/photon_test.exs

@@ -1,10 +1,12 @@
 defmodule Mobilizon.Service.Geospatial.PhotonTest do
+  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
   use Mobilizon.DataCase, async: false
-  alias Mobilizon.Service.Geospatial.Photon
-  alias Mobilizon.Addresses.Address
 
   import Mock
-  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
+  alias Mobilizon.Addresses.Address
+  alias Mobilizon.Service.Geospatial.Photon
 
   describe "search address" do
     test "produces a valid search address with options" do

test/mobilizon_web/api/report_test.exs

@@ -5,10 +5,10 @@ defmodule MobilizonWeb.API.ReportTest do
 
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Events.{Comment, Event}
-  alias Mobilizon.Reports.{Report, Note}
+  alias Mobilizon.Reports.{Note, Report}
+  alias Mobilizon.Service.ActivityPub.Activity
   alias Mobilizon.Users
   alias Mobilizon.Users.User
-  alias Mobilizon.Service.ActivityPub.Activity
 
   alias MobilizonWeb.API.Reports
 

test/mobilizon_web/api/search_test.exs

@@ -1,17 +1,17 @@
 defmodule MobilizonWeb.API.SearchTest do
   use ExUnit.Case, async: false
 
-  alias Mobilizon.Events
-  alias Mobilizon.Events.Event
+  import Mock
+
   alias Mobilizon.Actors
   alias Mobilizon.Actors.Actor
+  alias Mobilizon.Events
+  alias Mobilizon.Events.Event
   alias Mobilizon.Service.ActivityPub
   alias Mobilizon.Storage.Page
 
   alias MobilizonWeb.API.Search
 
-  import Mock
-
   test "search an user by username" do
     with_mock ActivityPub,
       find_or_make_actor_from_nickname: fn "toto@domain.tld" -> {:ok, %Actor{id: 42}} end do

test/mobilizon_web/controllers/activity_pub_controller_test.exs

@@ -4,16 +4,20 @@
 # Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/test/web/web_finger/web_finger_controller_test.exs
 
 defmodule MobilizonWeb.ActivityPubControllerTest do
+  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
+
   use MobilizonWeb.ConnCase
+
   import Mobilizon.Factory
-  alias MobilizonWeb.ActivityPub.ActorView
-  alias MobilizonWeb.PageView
+
   alias Mobilizon.{Actors, Config}
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.ActivityPub
-  use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
-  alias MobilizonWeb.Router.Helpers, as: Routes
+
+  alias MobilizonWeb.ActivityPub.ActorView
   alias MobilizonWeb.Endpoint
+  alias MobilizonWeb.PageView
+  alias MobilizonWeb.Router.Helpers, as: Routes
 
   setup do
     conn = build_conn() |> put_req_header("accept", "application/activity+json")

test/mobilizon_web/controllers/feed_controller_test.exs

@@ -1,8 +1,10 @@
 defmodule MobilizonWeb.FeedControllerTest do
   use MobilizonWeb.ConnCase
+
   import Mobilizon.Factory
-  alias MobilizonWeb.Router.Helpers, as: Routes
+
   alias MobilizonWeb.Endpoint
+  alias MobilizonWeb.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",

test/mobilizon_web/controllers/page_controller_test.exs

@@ -1,9 +1,12 @@
 defmodule MobilizonWeb.PageControllerTest do
   use MobilizonWeb.ConnCase
+
   import Mobilizon.Factory
+
   alias Mobilizon.Actors.Actor
-  alias MobilizonWeb.Router.Helpers, as: Routes
+
   alias MobilizonWeb.Endpoint
+  alias MobilizonWeb.Router.Helpers, as: Routes
 
   setup do
     conn = build_conn() |> put_req_header("accept", "text/html")

test/mobilizon_web/resolvers/admin_resolver_test.exs

@@ -1,12 +1,14 @@
 defmodule MobilizonWeb.Resolvers.AdminResolverTest do
-  alias MobilizonWeb.AbsintheHelpers
   use MobilizonWeb.ConnCase
+
   import Mobilizon.Factory
 
-  alias Mobilizon.Events.Event
   alias Mobilizon.Actors.Actor
+  alias Mobilizon.Events.Event
+  alias Mobilizon.Reports.{Note, Report}
   alias Mobilizon.Users.User
-  alias Mobilizon.Reports.{Report, Note}
+
+  alias MobilizonWeb.AbsintheHelpers
 
   describe "Resolver: List the action logs" do
     @note_content "This a note on a report"

test/mobilizon_web/resolvers/report_resolver_test.exs

@@ -1,12 +1,14 @@
 defmodule MobilizonWeb.Resolvers.ReportResolverTest do
-  alias MobilizonWeb.AbsintheHelpers
   use MobilizonWeb.ConnCase
+
   import Mobilizon.Factory
 
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Users.User
   alias Mobilizon.Events.Event
-  alias Mobilizon.Reports.{Report, Note}
+  alias Mobilizon.Reports.{Note, Report}
+  alias Mobilizon.Users.User
+
+  alias MobilizonWeb.AbsintheHelpers
 
   describe "Resolver: Report a content" do
     test "create_report/3 creates a report", %{conn: conn} do

test/mobilizon_web/resolvers/user_resolver_test.exs

@@ -9,8 +9,8 @@ defmodule MobilizonWeb.Resolvers.UserResolverTest do
   alias Mobilizon.{Actors, Config, Users}
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.Users.ResetPassword
-  alias Mobilizon.Users.User
   alias Mobilizon.Users
+  alias Mobilizon.Users.User
 
   alias MobilizonWeb.{AbsintheHelpers, Email}
 

test/mobilizon_web/upload_test.exs

@@ -198,7 +198,7 @@ defmodule Mobilizon.UploadTest do
     end
   end
 
-  defp upload() do
+  defp upload do
     File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
 
     file = %Plug.Upload{

test/support/factory.ex

@@ -8,8 +8,8 @@ defmodule Mobilizon.Factory do
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Crypto
 
-  alias MobilizonWeb.Router.Helpers, as: Routes
   alias MobilizonWeb.Endpoint
+  alias MobilizonWeb.Router.Helpers, as: Routes
   alias MobilizonWeb.Upload
 
   def user_factory do

test/support/mocks/geospatial_mock.ex

@@ -1,9 +1,10 @@
 defmodule Mobilizon.Service.Geospatial.Mock do
   @moduledoc """
-  Mock for Geospatial Provider implementations
+  Mock for Geospatial Provider implementations.
   """
-  alias Mobilizon.Service.Geospatial.Provider
+
   alias Mobilizon.Addresses.Address
+  alias Mobilizon.Service.Geospatial.Provider
 
   @behaviour Provider
 

test/tasks/relay_test.exs

@@ -3,12 +3,14 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Mix.Tasks.Mobilizon.RelayTest do
-  alias Mobilizon.Actors.{Actor, Follower}
-  alias Mobilizon.Actors
-  alias Mobilizon.Service.ActivityPub.Relay
-  use Mobilizon.DataCase
   use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
 
+  use Mobilizon.DataCase
+
+  alias Mobilizon.Actors
+  alias Mobilizon.Actors.{Actor, Follower}
+  alias Mobilizon.Service.ActivityPub.Relay
+
   describe "running follow" do
     test "relay is followed" do
       use_cassette "relay/fetch_relay_follow" do