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

fixes build, changes i18n ignored keys and specs

Browse Source 
ref: #254
This commit is contained in:
Juanjo Bazán
2015-08-27 18:07:57 +02:00
committed by Juanjo Bazán
parent caf3e5ee74
commit 1d997d4929
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/debates_helper.rb
View File

@@ -6,7 +6,7 @@ module DebatesHelper
private private
def available_order_filters_array(orders) def available_order_filters_array(orders)
orders.map { |f| [t("debates.index.order_#{f}"), f] } orders.map { |f| [t("debates.index.orders.#{f}"), f] }
end end
end end

1
config/i18n-tasks.yml
View File

@@ -102,6 +102,7 @@ ignore_unused:
- 'admin.officials.level_*' - 'admin.officials.level_*'
- 'helpers.page_entries_info.*' # kaminari - 'helpers.page_entries_info.*' # kaminari
- 'views.pagination.*' # kaminari - 'views.pagination.*' # kaminari
- 'debates.index.orders.*' #order filters for debates
# - '{devise,kaminari,will_paginate}.*' # - '{devise,kaminari,will_paginate}.*'
# - 'simple_form.{yes,no}' # - 'simple_form.{yes,no}'
# - 'simple_form.{placeholders,hints,labels}.*' # - 'simple_form.{placeholders,hints,labels}.*'

7
config/locales/en.yml
View File

@@ -33,9 +33,10 @@ en:
index: index:
create_debate: Create a debate create_debate: Create a debate
showing: You are seeing debates showing: You are seeing debates
order_created_at: the newest orders:
order_total_votes: the most voted created_at: newest
order_likes: the best rated total_votes: most voted
likes: best rated
filter_topic: "You are seeing %{number} debates with the topic '%{topic}'" filter_topic: "You are seeing %{number} debates with the topic '%{topic}'"
debate: debate:
debate: Debate debate: Debate

7
config/locales/es.yml
View File

@@ -33,9 +33,10 @@ es:
index: index:
create_debate: Crea un debate create_debate: Crea un debate
showing: "Estás viendo los debates" showing: "Estás viendo los debates"
order_created_at: "más nuevos" orders:
order_total_votes: "más votados" created_at: "más nuevos"
order_likes: mejor valorados total_votes: "más votados"
likes: mejor valorados
filter_topic: "Estás viendo %{number} debates con el tema '%{topic}'" filter_topic: "Estás viendo %{number} debates con el tema '%{topic}'"
debate: debate:
debate: Debate debate: Debate

17
spec/features/debates_spec.rb
View File

@@ -353,7 +353,6 @@ feature 'Debates' do
feature 'Debate index order filters', :js do feature 'Debate index order filters', :js do
before do before do
# TODO consider using debate title literally
@most_voted_debate = create(:debate) @most_voted_debate = create(:debate)
@most_liked_debate = create(:debate) @most_liked_debate = create(:debate)
@most_recent_debate = create(:debate) @most_recent_debate = create(:debate)
@@ -365,17 +364,17 @@ feature 'Debates' do
scenario 'Default order is created_at' do scenario 'Default order is created_at' do
visit debates_path visit debates_path
expect(page).to have_select('order-selector', selected: 'the newest') expect(page).to have_select('order-selector', selected: 'newest')
expect(@most_recent_debate.title).to appear_before(@most_liked_debate.title) expect(@most_recent_debate.title).to appear_before(@most_liked_debate.title)
end end
scenario 'Debates are ordered by most voted' do scenario 'Debates are ordered by most voted' do
visit debates_path visit debates_path
select 'the most voted', from: 'order-selector' select 'most voted', from: 'order-selector'
expect(page).to have_select('order-selector', selected: 'the most voted') expect(page).to have_select('order-selector', selected: 'most voted')
expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title)
expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title) # Necessary to force capybara to wait for redirect
expect(current_url).to include('order=total_votes') expect(current_url).to include('order=total_votes')
expect(@most_voted_debate.title).to appear_before(@most_liked_debate.title) expect(@most_voted_debate.title).to appear_before(@most_liked_debate.title)
expect(@most_liked_debate.title).to appear_before(@most_recent_debate.title) expect(@most_liked_debate.title).to appear_before(@most_recent_debate.title)
@@ -384,7 +383,8 @@ feature 'Debates' do
scenario 'Debates are ordered by best rated' do scenario 'Debates are ordered by best rated' do
visit debates_path visit debates_path
select 'the best rated', from: 'order-selector' select 'best rated', from: 'order-selector'
expect(page).to have_select('order-selector', selected: 'best rated')
expect(find("#debates .debate", match: :first)).to have_content(@most_liked_debate.title) expect(find("#debates .debate", match: :first)).to have_content(@most_liked_debate.title)
expect(current_url).to include('order=likes') expect(current_url).to include('order=likes')
@@ -395,10 +395,11 @@ feature 'Debates' do
scenario 'Debates are ordered by newest' do scenario 'Debates are ordered by newest' do
visit debates_path visit debates_path
select 'the most voted', from: 'order-selector' select 'most voted', from: 'order-selector'
expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title) expect(find("#debates .debate", match: :first)).to have_content(@most_voted_debate.title)
select 'the newest', from: 'order-selector' select 'newest', from: 'order-selector'
expect(page).to have_select('order-selector', selected: 'newest')
expect(find("#debates .debate", match: :first)).to have_content(@most_recent_debate.title) expect(find("#debates .debate", match: :first)).to have_content(@most_recent_debate.title)
expect(current_url).to include('order=created_at') expect(current_url).to include('order=created_at')