From cd3806476f787bbf2fda0af03dd0f04d4c818cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Thu, 3 Sep 2015 18:20:12 +0200 Subject: [PATCH] removes 'most voted' order from debates --- app/controllers/debates_controller.rb | 2 +- app/models/debate.rb | 1 - config/locales/en.yml | 1 - config/locales/es.yml | 1 - spec/features/debates_spec.rb | 16 ++-------------- 5 files changed, 3 insertions(+), 18 deletions(-) diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index 70cd4f2ec..6834345e2 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -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 diff --git a/app/models/debate.rb b/app/models/debate.rb index 27cf1c228..19a3b7280 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -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) } diff --git a/config/locales/en.yml b/config/locales/en.yml index 7d6553494..63c935d94 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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}'" diff --git a/config/locales/es.yml b/config/locales/es.yml index 92d47e43f..1a93df1b7 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -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}''" diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index 8ee295cea..f05b059fc 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -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')