consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes issues in moderation spex related with comment sort

Browse Source
This commit is contained in:
kikito
2015-11-02 15:54:15 +01:00
parent f0e9005332
commit cf31e89204
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/management/proposals_controller.rb
View File

@@ -7,7 +7,7 @@ class Management::ProposalsController < Management::BaseController
before_action :parse_search_terms, only: :index before_action :parse_search_terms, only: :index
has_orders %w{confidence_score hot_score created_at most_commented random}, only: [:index, :print] has_orders %w{confidence_score hot_score created_at most_commented random}, only: [:index, :print]
has_orders %w{confidence_score created_at}, only: :show has_orders %w{most_voted newest}, only: :show
def vote def vote
@proposal.register_vote(current_user, 'yes') @proposal.register_vote(current_user, 'yes')

2
app/controllers/moderation/comments_controller.rb
View File

@@ -2,7 +2,7 @@ class Moderation::CommentsController < Moderation::BaseController
include ModerateActions include ModerateActions
has_filters %w{pending_flag_review all with_ignored_flag}, only: :index has_filters %w{pending_flag_review all with_ignored_flag}, only: :index
has_orders %w{flags created_at}, only: :index has_orders %w{flags newest}, only: :index
before_action :load_resources, only: [:index, :moderate] before_action :load_resources, only: [:index, :moderate]

2
config/locales/moderation.en.yml
View File

@@ -24,7 +24,7 @@ en:
with_ignored_flag: "Marked as viewed" with_ignored_flag: "Marked as viewed"
order: "Order" order: "Order"
orders: orders:
created_at: "Newest" newest: "Newest"
flags: "Most flagged" flags: "Most flagged"
confirm: "Are you sure?" confirm: "Are you sure?"
debates: debates:

2
config/locales/moderation.es.yml
View File

@@ -24,7 +24,7 @@ es:
with_ignored_flag: "Marcados como revisados" with_ignored_flag: "Marcados como revisados"
order: "Orden" order: "Orden"
orders: orders:
created_at: "Más nuevos" newest: "Más nuevos"
flags: "Más denunciados" flags: "Más denunciados"
confirm: "¿Estás seguro?" confirm: "¿Estás seguro?"
debates: debates:

2
spec/features/management/proposals_spec.rb
View File

@@ -197,4 +197,4 @@ feature 'Proposals' do
end end
end end
end end

10
spec/features/moderation/comments_spec.rb
View File

@@ -104,15 +104,15 @@ feature 'Moderate comments' do
scenario "remembering page, filter and order" do scenario "remembering page, filter and order" do
create_list(:comment, 52) create_list(:comment, 52)
visit moderation_comments_path(filter: 'all', page: '2', order: 'created_at') visit moderation_comments_path(filter: 'all', page: '2', order: 'newest')
click_on "Mark as viewed" click_on "Mark as viewed"
expect(page).to have_selector('.js-order-selector[data-order="created_at"]') expect(page).to have_selector('.js-order-selector[data-order="newest"]')
expect(current_url).to include('filter=all') expect(current_url).to include('filter=all')
expect(current_url).to include('page=2') expect(current_url).to include('page=2')
expect(current_url).to include('order=created_at') expect(current_url).to include('order=newest')
end end
end end
@@ -174,7 +174,7 @@ feature 'Moderate comments' do
create(:comment, body: "Flagged newer comment", created_at: Time.now - 12.hours, flags_count: 3) create(:comment, body: "Flagged newer comment", created_at: Time.now - 12.hours, flags_count: 3)
create(:comment, body: "Newer comment", created_at: Time.now) create(:comment, body: "Newer comment", created_at: Time.now)
visit moderation_comments_path(order: 'created_at') visit moderation_comments_path(order: 'newest')
expect("Flagged newer comment").to appear_before("Flagged comment") expect("Flagged newer comment").to appear_before("Flagged comment")
@@ -182,7 +182,7 @@ feature 'Moderate comments' do
expect("Flagged comment").to appear_before("Flagged newer comment") expect("Flagged comment").to appear_before("Flagged newer comment")
visit moderation_comments_path(filter: 'all', order: 'created_at') visit moderation_comments_path(filter: 'all', order: 'newest')
expect("Newer comment").to appear_before("Flagged newer comment") expect("Newer comment").to appear_before("Flagged newer comment")
expect("Flagged newer comment").to appear_before("Flagged comment") expect("Flagged newer comment").to appear_before("Flagged comment")