removes 'most voted' order from debates
This commit is contained in:
@@ -82,7 +82,7 @@ class DebatesController < ApplicationController
|
||||
end
|
||||
|
||||
def parse_order
|
||||
@valid_orders = ['total_votes', 'created_at', 'score']
|
||||
@valid_orders = ['created_at', 'score']
|
||||
@order = @valid_orders.include?(params[:order]) ? params[:order] : 'created_at'
|
||||
end
|
||||
|
||||
|
||||
@@ -28,7 +28,6 @@ class Debate < ActiveRecord::Base
|
||||
scope :with_ignored_flag, -> { where("ignored_flag_at IS NOT NULL AND hidden_at IS NULL") }
|
||||
scope :flagged, -> { where("flags_count > 0") }
|
||||
scope :for_render, -> { includes(:tags) }
|
||||
scope :sort_by_total_votes, -> { reorder(cached_votes_total: :desc) }
|
||||
scope :sort_by_score , -> { reorder(cached_votes_score: :desc) }
|
||||
scope :sort_by_created_at, -> { reorder(created_at: :desc) }
|
||||
|
||||
|
||||
@@ -70,7 +70,6 @@ en:
|
||||
select_order_long: Order debates by
|
||||
orders:
|
||||
created_at: newest
|
||||
total_votes: most voted
|
||||
score: best rated
|
||||
filter_topic:
|
||||
one: "You are seeing one debate with the topic '%{topic}'"
|
||||
|
||||
@@ -70,7 +70,6 @@ es:
|
||||
select_order_long: Estás viendo los debates
|
||||
orders:
|
||||
created_at: "más nuevos"
|
||||
total_votes: "más votados"
|
||||
score: "mejor valorados"
|
||||
filter_topic:
|
||||
one: "Estás viendo un debate con el tema ''%{topic}''"
|
||||
|
||||
@@ -368,18 +368,6 @@ feature 'Debates' do
|
||||
expect(@most_recent_debate.title).to appear_before(@most_score_debate.title)
|
||||
end
|
||||
|
||||
scenario 'Debates are ordered by most voted' do
|
||||
visit debates_path
|
||||
|
||||
select 'most voted', from: 'order-selector'
|
||||
expect(page).to have_select('order-selector', selected: 'most voted')
|
||||
expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title)
|
||||
|
||||
expect(current_url).to include('order=total_votes')
|
||||
expect(@most_voted_debate.title).to appear_before(@most_score_debate.title)
|
||||
expect(@most_score_debate.title).to appear_before(@most_recent_debate.title)
|
||||
end
|
||||
|
||||
scenario 'Debates are ordered by best rated' do
|
||||
visit debates_path
|
||||
|
||||
@@ -395,8 +383,8 @@ feature 'Debates' do
|
||||
scenario 'Debates are ordered by newest' do
|
||||
visit debates_path
|
||||
|
||||
select 'most voted', from: 'order-selector'
|
||||
expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title)
|
||||
select 'best rated', from: 'order-selector'
|
||||
expect(find("#debates .debate", match: :first)).to have_content(@most_score_debate.title)
|
||||
|
||||
select 'newest', from: 'order-selector'
|
||||
expect(page).to have_select('order-selector', selected: 'newest')
|
||||
|
||||
Reference in New Issue
Block a user