diff --git a/releaf-core/app/lib/releaf/action_controller/exceptions.rb b/releaf-core/app/lib/releaf/action_controller/exceptions.rb index 58518625e..c8848a363 100644 --- 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 index 407156ba4..e0353084c 100644 --- 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 deleted file mode 100644 index fee2ffab5..000000000 --- a/releaf-core/app/lib/releaf/responders/access_denied_responder.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Releaf::Responders - class AccessDeniedResponder < ActionController::Responder - include Releaf::Responders::ErrorResponder - - def status_code - 403 - end - end -end diff --git a/releaf-core/app/lib/releaf/responders/error_responder.rb b/releaf-core/app/lib/releaf/responders/error_responder.rb deleted file mode 100644 index cf0cb0d6a..000000000 --- a/releaf-core/app/lib/releaf/responders/error_responder.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Releaf::Responders::ErrorResponder - def template - self.class.name.split("::").last.gsub(/Responder$/, "").underscore - end - - def to_html - render "releaf/error_pages/#{template}", status: status_code - end -end 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 deleted file mode 100644 index bdc5de6ed..000000000 --- a/releaf-core/app/lib/releaf/responders/page_not_found_responder.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Releaf::Responders - class PageNotFoundResponder < ActionController::Responder - include Releaf::Responders::ErrorResponder - - def status_code - 404 - end - end -end diff --git a/releaf-core/app/views/releaf/error_pages/access_denied.html.haml b/releaf-core/app/views/releaf/error_pages/forbidden.html.haml similarity index 100% rename from releaf-core/app/views/releaf/error_pages/access_denied.html.haml rename to releaf-core/app/views/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 deleted file mode 100644 index 1002d569e..000000000 --- a/releaf-core/spec/lib/releaf/responders/access_denied_responder_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "rails_helper" - -describe Releaf::Responders::AccessDeniedResponder, type: :controller do - controller{} - subject{ described_class.new(controller, []) } - - describe "#status_code" do - it "returns 404" do - expect(subject.status_code).to eq(403) - end - end -end diff --git a/releaf-core/spec/lib/releaf/responders/error_responder_spec.rb b/releaf-core/spec/lib/releaf/responders/error_responder_spec.rb deleted file mode 100644 index bbceb2bb3..000000000 --- a/releaf-core/spec/lib/releaf/responders/error_responder_spec.rb +++ /dev/null @@ -1,26 +0,0 @@ -require "rails_helper" - -describe Releaf::Responders::ErrorResponder, type: :controller do - class Releaf::Responders::DummyErrorResponder < ActionController::Responder - include Releaf::Responders::ErrorResponder - def status_code - 401 - end - end - - controller{} - subject{ Releaf::Responders::DummyErrorResponder.new(controller, []) } - - describe "#template" do - it "returns template based on class name" do - expect(subject.template).to eq("dummy_error") - end - end - - describe "#to_html" do - it "renders error template with class status code" do - expect(subject).to receive(:render).with("releaf/error_pages/dummy_error", status: 401) - subject.to_html - end - end -end 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 deleted file mode 100644 index 235c2e116..000000000 --- a/releaf-core/spec/lib/releaf/responders/page_not_found_responder_spec.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "rails_helper" - -describe Releaf::Responders::PageNotFoundResponder, type: :controller do - controller{} - subject{ described_class.new(controller, []) } - - describe "#status_code" do - it "returns 404" do - expect(subject.status_code).to eq(404) - end - end -end diff --git a/releaf-core/spec/lib/releaf/responders_spec.rb b/releaf-core/spec/lib/releaf/responders_spec.rb index 8d81e3d24..ec055816e 100644 --- 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