mirror/mobilizon
1
0
Fork 0
mirror of https://framagit.org/framasoft/mobilizon.git synced 2024-12-22 07:52:43 +00:00
Code Issues Releases Wiki Activity

Fix tests for FeedController

Browse source 
And remove useless Fallbacks in Fallback controller

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-04-30 14:21:33 +02:00
parent 7c8f1a56af
commit e97be0b814
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
2 changed files with 6 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/mobilizon_web/controllers/fallback_controller.ex
View file

@ -6,20 +6,6 @@ defmodule MobilizonWeb.FallbackController do
"""
use MobilizonWeb, :controller
def call(conn, {:error, %Ecto.Changeset{} = changeset}) do
conn
|> put_status(:unprocessable_entity)
|> put_view(MobilizonWeb.ChangesetView)
|> render("error.json", changeset: changeset)
end
def call(conn, {:error, nil}) do
conn
|> put_status(:unprocessable_entity)
|> put_view(MobilizonWeb.ErrorView)
|> render("invalid_request.json")
end
def call(conn, {:error, :not_found}) do
conn
|> put_status(:not_found)

21
lib/mobilizon_web/controllers/feed_controller.ex
View file

@ -3,6 +3,7 @@ defmodule MobilizonWeb.FeedController do
Controller to serve RSS, ATOM and iCal Feeds
"""
use MobilizonWeb, :controller
action_fallback(MobilizonWeb.FallbackController)
def actor(conn, %{"name" => name, "format" => "atom"}) do
with {status, data} when status in [:ok, :commit] <-
@ -12,9 +13,7 @@ defmodule MobilizonWeb.FeedController do
|> send_resp(200, data)
else
_err ->
conn
|> put_resp_content_type("text/html")
|> send_file(404, "priv/static/index.html")
{:error, :not_found}
end
end
@ -26,9 +25,7 @@ defmodule MobilizonWeb.FeedController do
|> send_resp(200, data)
else
_err ->
conn
|> put_resp_content_type("text/html")
|> send_file(404, "priv/static/index.html")
{:error, :not_found}
end
end
@ -40,9 +37,7 @@ defmodule MobilizonWeb.FeedController do
|> send_resp(200, data)
else
_err ->
conn
|> put_resp_content_type("text/html")
|> send_file(404, "priv/static/index.html")
{:error, :not_found}
end
end
@ -54,9 +49,7 @@ defmodule MobilizonWeb.FeedController do
|> send_resp(200, data)
else
_err ->
conn
|> put_resp_content_type("text/html")
|> send_file(404, "priv/static/index.html")
{:error, :not_found}
end
end
@ -68,9 +61,7 @@ defmodule MobilizonWeb.FeedController do
|> send_resp(200, data)
else
_err ->
conn
|> put_resp_content_type("text/html")
|> send_file(404, "priv/static/index.html")
{:error, :not_found}
end
end
end