Simplify 403/404 responses by always responding with html

cubesystems · Aug 19, 2021 · 222acfe · 222acfe
1 parent 532ff0c
commit 222acfe
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 85 deletions.
diff --git a/releaf-core/app/lib/releaf/action_controller/exceptions.rb b/releaf-core/app/lib/releaf/action_controller/exceptions.rb
@@ -7,10 +7,10 @@ module Releaf::ActionController::Exceptions
   end
 
   def page_not_found
-    respond_with(nil, responder: action_responder(:page_not_found))
+    render "releaf/error_pages/page_not_found", status: :not_found, formats: :html
   end
 
   def access_denied
-    respond_with(nil, responder: action_responder(:access_denied))
+    render "releaf/error_pages/forbidden", status: :forbidden, formats: :html
   end
 end
diff --git a/releaf-core/app/lib/releaf/responders.rb b/releaf-core/app/lib/releaf/responders.rb
@@ -11,8 +11,6 @@ def action_responders
       update: Releaf::Responders::AfterSaveResponder,
       confirm_destroy: Releaf::Responders::ConfirmDestroyResponder,
       destroy: Releaf::Responders::DestroyResponder,
-      access_denied: Releaf::Responders::AccessDeniedResponder,
-      page_not_found: Releaf::Responders::PageNotFoundResponder,
     }
   end
 

diff --git a/releaf-core/app/lib/releaf/responders/access_denied_responder.rb b/releaf-core/app/lib/releaf/responders/access_denied_responder.rb
diff --git a/releaf-core/app/lib/releaf/responders/error_responder.rb b/releaf-core/app/lib/releaf/responders/error_responder.rb
diff --git a/releaf-core/app/lib/releaf/responders/page_not_found_responder.rb b/releaf-core/app/lib/releaf/responders/page_not_found_responder.rb
diff --git a/...eleaf/error_pages/access_denied.html.haml → ...ws/releaf/error_pages/forbidden.html.haml b/...eleaf/error_pages/access_denied.html.haml → ...ws/releaf/error_pages/forbidden.html.haml
diff --git a/releaf-core/spec/lib/releaf/responders/access_denied_responder_spec.rb b/releaf-core/spec/lib/releaf/responders/access_denied_responder_spec.rb
diff --git a/releaf-core/spec/lib/releaf/responders/error_responder_spec.rb b/releaf-core/spec/lib/releaf/responders/error_responder_spec.rb
diff --git a/releaf-core/spec/lib/releaf/responders/page_not_found_responder_spec.rb b/releaf-core/spec/lib/releaf/responders/page_not_found_responder_spec.rb
diff --git a/releaf-core/spec/lib/releaf/responders_spec.rb b/releaf-core/spec/lib/releaf/responders_spec.rb
@@ -21,8 +21,8 @@
     context "when responder is defined within options" do
       it "adds active responder to `responder` options" do
         expect(Releaf::Responders::AfterSaveResponder).to_not receive(:call)
-        expect(Releaf::Responders::PageNotFoundResponder).to receive(:call)
-        subject.respond_with(nil, responder: Releaf::Responders::PageNotFoundResponder)
+        expect(Releaf::Responders::DestroyResponder).to receive(:call)
+        subject.respond_with(nil, responder: Releaf::Responders::DestroyResponder)
       end
     end
   end
@@ -34,8 +34,6 @@
         update: Releaf::Responders::AfterSaveResponder,
         confirm_destroy: Releaf::Responders::ConfirmDestroyResponder,
         destroy: Releaf::Responders::DestroyResponder,
-        access_denied: Releaf::Responders::AccessDeniedResponder,
-        page_not_found: Releaf::Responders::PageNotFoundResponder,
       }
       expect(subject.action_responders).to eq(hash)
     end