From e97be0b814c149fcafb421e73509cfba06bae835 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 30 Apr 2019 14:21:33 +0200
Subject: [PATCH] Fix tests for FeedController

And remove useless Fallbacks in Fallback controller

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 .../controllers/fallback_controller.ex        | 14 -------------
 .../controllers/feed_controller.ex            | 21 ++++++-------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/lib/mobilizon_web/controllers/fallback_controller.ex b/lib/mobilizon_web/controllers/fallback_controller.ex
index cf85e7ed5..ec74eadba 100644
--- a/lib/mobilizon_web/controllers/fallback_controller.ex
+++ b/lib/mobilizon_web/controllers/fallback_controller.ex
@@ -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)
diff --git a/lib/mobilizon_web/controllers/feed_controller.ex b/lib/mobilizon_web/controllers/feed_controller.ex
index cd4dbfa2d..75f174b0c 100644
--- a/lib/mobilizon_web/controllers/feed_controller.ex
+++ b/lib/mobilizon_web/controllers/feed_controller.ex
@@ -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