Skip to content
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.

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

[#57664] ActiveRecord::RecordNotFound in ActivitiesController#index #16688

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 7 additions & 9 deletions app/controllers/activities_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,18 @@ class ActivitiesController < ApplicationController

accept_key_auth :index

rescue_from ActiveRecord::RecordNotFound do |exception|
op_handle_warning "Failed to find all resources in activities: #{exception.message}"
render_404(message: I18n.t(:error_can_not_find_all_resources))
end

def index
@events = @activity.events(from: @date_from.to_datetime, to: @date_to.to_datetime)

respond_to do |format|
format.html do
respond_html
end
format.atom do
respond_atom
end
format.html { respond_html }
format.atom { respond_atom }
end
rescue ActiveRecord::RecordNotFound => e
op_handle_warning "Failed to find all resources in activities: #{e.message}"
render_404 I18n.t(:error_can_not_find_all_resources)
end

def menu
Expand Down
10 changes: 10 additions & 0 deletions spec/controllers/activities_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,16 @@
expect(response).to have_http_status(:not_found)
end
end

describe "inactive user activity" do
let!(:inactive_user) { create(:user, status: User.statuses[:locked]) }
cbliard marked this conversation as resolved.
Show resolved Hide resolved

it "renders 404" do
get "index", params: { user_id: inactive_user.id }
expect(response).to have_http_status(:not_found)
expect(response).to render_template "common/error"
end
end
end

describe "with activated activity module" do
Expand Down
Loading