From 19212a6b466d12c30763bb965986b3900a2603c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 17 Nov 2015 19:40:18 +0100 Subject: [PATCH] fixes 'My activity' comments count for admins/mods --- app/controllers/users_controller.rb | 2 +- spec/features/users_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 86ddaebbe..d505cef8c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -12,7 +12,7 @@ class UsersController < ApplicationController @activity_counts = HashWithIndifferentAccess.new( proposals: Proposal.where(author_id: @user.id).count, debates: Debate.where(author_id: @user.id).count, - comments: Comment.where(user_id: @user.id).count) + comments: Comment.not_as_admin_or_moderator.where(user_id: @user.id).count) end def load_filtered_activity diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index 952c53419..afd400c0d 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -208,6 +208,7 @@ feature 'Users' do moderator_comment = create(:comment, user: moderator, moderator_id: moderator.id) visit user_path(moderator) + expect(page).to have_content("1 Comment") expect(page).to have_content(comment.body) expect(page).to_not have_content(moderator_comment.body) end