Skip to content

added handler for Pundit errors on ApplicationController #3036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briri merged 5 commits into from
Oct 1, 2021
Merged

added handler for Pundit errors on ApplicationController #3036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97e0e49
added handler for Pundit errors on ApplicationController
briri Sep 27, 2021
112ccc7
Merge branch 'development' into handle_pundit_errors
raycarrick-ed Sep 28, 2021
0e582c0
fixed tests broken by change to redirect when pundit errors
briri Sep 29, 2021
aa39042
Merge branch 'handle_pundit_errors' of github.com:DMPRoadmap/roadmap …
briri Sep 29, 2021
68f8ed2
Merge branch 'development' into handle_pundit_errors
briri Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ class ApplicationController < ActionController::Base

rescue_from StandardError, with: :handle_server_error

rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized

private

def current_org
Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/super_admin/orgs_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
sign_in(create(:user))
post :merge_analyze, params: @params
expect(response.code).to eql("302")
expect(response).to redirect_to(root_path)
expect(response).to redirect_to(plans_path)
expect(flash[:alert].present?).to eql(true)
end
it "succeeds in analyzing the Orgs" do
Expand All @@ -64,7 +64,7 @@
sign_in(create(:user))
post :merge_commit, params: @params
expect(response.code).to eql("302")
expect(response).to redirect_to(root_path)
expect(response).to redirect_to(plans_path)
expect(flash[:alert].present?).to eql(true)
end
it "fails if :target_org is not found" do
Expand Down