Fix refactoring opportunities

This commit is contained in:
miffigriffi
2019-09-22 13:41:24 +02:00
committed by Thomas Citharel
parent 4d4fdaaffe
commit 20dfce5c83
18 changed files with 122 additions and 90 deletions

View File

@@ -28,7 +28,7 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
Signature.sign(actor, %{
host: "example.com",
"content-length": 15,
digest: Jason.encode!(%{id: "my_id"}) |> Signature.build_digest(),
digest: %{id: "my_id"} |> Jason.encode!() |> Signature.build_digest(),
"(request-target)": Signature.generate_request_target("POST", "/inbox"),
date: Signature.generate_date_header()
})

View File

@@ -784,7 +784,9 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
assert :error == Transmogrifier.handle_incoming(reject_data)
# Organiser is not present since we use factories directly
assert Events.list_participants_for_event(event.id) |> Enum.map(& &1.id) ==
assert event.id
|> Events.list_participants_for_event()
|> Enum.map(& &1.id) ==
[]
end
@@ -812,9 +814,10 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
assert activity.data["actor"] == participant_url
# The only participant left is the organizer
assert Events.list_participants_for_event(event.id) |> Enum.map(& &1.id) == [
organizer_participation.id
]
assert event.id
|> Events.list_participants_for_event()
|> Enum.map(& &1.id) ==
[organizer_participation.id]
end
test "it refuses Leave activities when actor is the only organizer" do

View File

@@ -16,7 +16,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn =
conn
|> get(
Routes.feed_url(Endpoint, :actor, actor.preferred_username, "atom")
Endpoint
|> Routes.feed_url(:actor, actor.preferred_username, "atom")
|> URI.decode()
)
@@ -48,7 +49,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn =
conn
|> get(
Routes.feed_url(Endpoint, :actor, actor.preferred_username, "atom")
Endpoint
|> Routes.feed_url(:actor, actor.preferred_username, "atom")
|> URI.decode()
)
@@ -63,7 +65,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn
|> put_req_header("accept", "application/atom+xml")
|> get(
Routes.feed_url(Endpoint, :actor, actor.preferred_username, "atom")
Endpoint
|> Routes.feed_url(:actor, actor.preferred_username, "atom")
|> URI.decode()
)
@@ -93,7 +96,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn =
conn
|> get(
Routes.feed_url(Endpoint, :actor, actor.preferred_username, "ics")
Endpoint
|> Routes.feed_url(:actor, actor.preferred_username, "ics")
|> URI.decode()
)
@@ -121,7 +125,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn =
conn
|> get(
Routes.feed_url(Endpoint, :actor, actor.preferred_username, "ics")
Endpoint
|> Routes.feed_url(:actor, actor.preferred_username, "ics")
|> URI.decode()
)
@@ -136,7 +141,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn
|> put_req_header("accept", "text/calendar")
|> get(
Routes.feed_url(Endpoint, :actor, actor.preferred_username, "ics")
Endpoint
|> Routes.feed_url(:actor, actor.preferred_username, "ics")
|> URI.decode()
)
@@ -163,7 +169,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn =
conn
|> get(
Routes.feed_url(Endpoint, :event, event1.uuid, "ics")
Endpoint
|> Routes.feed_url(:event, event1.uuid, "ics")
|> URI.decode()
)
@@ -194,7 +201,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn =
conn
|> get(
Routes.feed_url(Endpoint, :going, feed_token.token, "atom")
Endpoint
|> Routes.feed_url(:going, feed_token.token, "atom")
|> URI.decode()
)
@@ -228,7 +236,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn
|> put_req_header("accept", "application/atom+xml")
|> get(
Routes.feed_url(Endpoint, :going, feed_token.token, "atom")
Endpoint
|> Routes.feed_url(:going, feed_token.token, "atom")
|> URI.decode()
)
@@ -247,7 +256,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn =
conn
|> get(
Routes.feed_url(Endpoint, :going, "not existing", "atom")
Endpoint
|> Routes.feed_url(:going, "not existing", "atom")
|> URI.decode()
)
@@ -272,7 +282,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn
|> put_req_header("accept", "text/calendar")
|> get(
Routes.feed_url(Endpoint, :going, feed_token.token, "ics")
Endpoint
|> Routes.feed_url(:going, feed_token.token, "ics")
|> URI.decode()
)
@@ -302,7 +313,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn
|> put_req_header("accept", "text/calendar")
|> get(
Routes.feed_url(Endpoint, :going, feed_token.token, "ics")
Endpoint
|> Routes.feed_url(:going, feed_token.token, "ics")
|> URI.decode()
)
@@ -318,7 +330,8 @@ defmodule MobilizonWeb.FeedControllerTest do
conn =
conn
|> get(
Routes.feed_url(Endpoint, :going, "not existing", "ics")
Endpoint
|> Routes.feed_url(:going, "not existing", "ics")
|> URI.decode()
)

View File

@@ -33,7 +33,8 @@ defmodule MobilizonWeb.Resolvers.TagResolverTest do
tags = json_response(res, 200)["data"]["tags"]
assert tags |> length == 3
assert Enum.filter(tags, fn tag -> tag["slug"] == tag1.slug end)
assert tags
|> Enum.filter(fn tag -> tag["slug"] == tag1.slug end)
|> hd
|> Map.get("related")
|> Enum.map(fn tag -> tag["slug"] end)