Fix tests

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

test/mobilizon_web/controllers/activity_pub_controller_test.exs

@@ -2,10 +2,9 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
   use MobilizonWeb.ConnCase
   import Mobilizon.Factory
   alias MobilizonWeb.ActivityPub.{ActorView, ObjectView}
-  alias Mobilizon.{Repo, Actors, Actors.Actor}
+  alias Mobilizon.Actors
   alias Mobilizon.Service.ActivityPub
-  alias Mobilizon.Activity
-  import Logger
+  alias Mobilizon.Service.ActivityPub.Utils
 
   describe "/@:preferred_username" do
     test "it returns a json representation of the actor", %{conn: conn} do
@@ -19,7 +18,6 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
       actor = Actors.get_actor!(actor.id)
 
       assert json_response(conn, 200) == ActorView.render("actor.json", %{actor: actor})
-      Logger.error(inspect(ActorView.render("actor.json", %{actor: actor})))
     end
   end
 
@@ -32,8 +30,8 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
         |> put_req_header("accept", "application/activity+json")
         |> get("/events/#{event.uuid}")
 
-      assert json_response(conn, 200) == ObjectView.render("event.json", %{event: event})
-      Logger.error(inspect(ObjectView.render("event.json", %{event: event})))
+      assert json_response(conn, 200) ==
+               ObjectView.render("event.json", %{event: event |> Utils.make_event_data()})
     end
 
     test "it returns 404 for non-public events", %{conn: conn} do
@@ -60,7 +58,7 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
 
       assert "ok" == json_response(conn, 200)
       :timer.sleep(500)
-      assert ActivityPub.fetch_object_from_url(data["object"]["id"], :note)
+      assert ActivityPub.fetch_object_from_url(data["object"]["id"])
     end
   end
 

test/mobilizon_web/controllers/nodeinfo_controller_test.exs

@@ -26,12 +26,13 @@ defmodule MobilizonWeb.NodeInfoControllerTest do
 
     resp = json_response(conn, 200)
 
-    assert resp = %{
+    assert resp == %{
              "metadata" => %{"nodeName" => Keyword.get(@instance, :name)},
              "openRegistrations" => Keyword.get(@instance, :registrations_open),
              "protocols" => ["activitypub"],
              "services" => %{"inbound" => [], "outbound" => []},
              "software" => %{"name" => "mobilizon", "version" => Keyword.get(@instance, :version)},
+             "usage" => %{"localComments" => 0, "localPosts" => 0, "users" => %{"total" => 0}},
              "version" => "2.0"
            }
   end

test/mobilizon_web/resolvers/actor_resolver_test.exs

@@ -1,9 +1,7 @@
 defmodule MobilizonWeb.Resolvers.ActorResolverTest do
   use MobilizonWeb.ConnCase
-  alias Mobilizon.{Events, Actors}
-  alias Mobilizon.Actors.Actor
+  alias Mobilizon.Actors
   alias MobilizonWeb.AbsintheHelpers
-  import Mobilizon.Factory
 
   @valid_actor_params %{email: "test@test.tld", password: "testest", username: "test"}
   @non_existent_username "nonexistent"

test/mobilizon_web/resolvers/event_resolver_test.exs

@@ -52,7 +52,7 @@ defmodule MobilizonWeb.Resolvers.EventResolverTest do
         |> get("/api", AbsintheHelpers.query_skeleton(query, "event"))
 
       assert [%{"message" => "Argument \"uuid\" has invalid value \"bad uuid\"."}] =
-               json_response(res, 400)["errors"]
+               json_response(res, 200)["errors"]
     end
 
     test "list_participants_for_event/3 returns participants for an event", context do

test/mobilizon_web/resolvers/user_resolver_test.exs

@@ -1,13 +1,11 @@
 defmodule MobilizonWeb.Resolvers.UserResolverTest do
   use MobilizonWeb.ConnCase
-  alias Mobilizon.{Events, Actors}
-  alias Mobilizon.Actors.{Actor, User}
+  alias Mobilizon.Actors
   alias MobilizonWeb.AbsintheHelpers
   import Mobilizon.Factory
   use Bamboo.Test
 
   @valid_actor_params %{email: "test@test.tld", password: "testest", username: "test"}
-  @non_existent_username "nonexistent"
 
   describe "User Resolver" do
     test "find_user/3 returns an user by it's id", context do
@@ -161,7 +159,7 @@ defmodule MobilizonWeb.Resolvers.UserResolverTest do
   end
 
   test "test validate_user/3 with invalid token doesn't validate an user", context do
-    {:ok, actor} = Actors.register(@valid_actor_params)
+    {:ok, _actor} = Actors.register(@valid_actor_params)
 
     mutation = """
         mutation {
@@ -219,7 +217,7 @@ defmodule MobilizonWeb.Resolvers.UserResolverTest do
 
   test "test resend_confirmation_email/3 with invalid email resends an validation email",
        context do
-    {:ok, actor} = Actors.register(@valid_actor_params)
+    {:ok, _actor} = Actors.register(@valid_actor_params)
 
     mutation = """
         mutation {