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

fixes build

Browse Source 
adds empty featured_debates
This commit is contained in:
Juanjo Bazán
2015-08-04 17:56:38 +02:00
parent 4344bc121f
commit c3046ccc2b
6 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/debates_controller.rb
View File

@@ -6,10 +6,11 @@ class DebatesController < ApplicationController
def index
if params[:tag]
@debates = Debate.tagged_with(params[:tag])
@debates = Debate.tagged_with(params[:tag]).order("created_at DESC")
else
@debates = Debate.all
@debates = Debate.all.order("created_at DESC")
end
@featured_debates = []
end
def show

42
app/views/debates/_featured_debates.html.erb Normal file
View File

@@ -0,0 +1,42 @@
<div class="small-12 medium-4 column debates-list">
<div class="row">
<div class="debates-featured">
<div id="debate-<%= debate.id %>" class="small-12 column end debate">
<div class="panel">
<div class="debate-content">
<span class="label left"><%= t("debates.debate.debate") %></span>
<i class="icon-quote-right right"></i>
<h3><%= link_to debate.title, debate %></h3>
<p class="debate-info">
<i class="icon-chat-bubble-two"></i>&nbsp;<%= pluralize(debate.comment_threads.count, t("debates.show.comment"), t("debates.show.comments")) %>
</p>
<p><%= sanitize(truncate(debate.description, length: 200).html_safe) %></p>
<p><%= render "shared/tags", debate: debate %></p>
</div>
<div class="row votes">
<div class="small-12 column">
<%= link_to debate_votes_path(debate, value: "yes"), class: "like", title: t('votes.agree'), method: "post" do %>
<i class="icon-like"></i>
<span><%= percentage('likes', debate) %></span>
<% end %>
<span class="divider"></span>
<%= link_to debate_votes_path(debate, value: "no"), class: "unlike", title: t('votes.disagree'), method: "post" do %>
<i class="icon-unlike"></i>
<span><%= percentage('dislikes', debate) %></span>
<% end %>
<span class="total-votes right">
<%= pluralize(debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

51
app/views/debates/index.html.erb
View File

@@ -1,52 +1,9 @@
<section id="debates" role="main">
<div class="row">
<!-- HTML for debates featured (3) -->
<% debate = @debates.first %>
<div class="small-12 medium-4 column debates-list">
<div class="row">
<div class="debates-featured">
<div id="debate-<%= debate.id %>" class="small-12 column end debate">
<div class="panel">
<div class="debate-content">
<span class="label left"><%= t("debates.debate.debate") %></span>
<i class="icon-quote-right right"></i>
<h3><%= link_to debate.title, debate %></h3>
<p class="debate-info">
<i class="icon-chat-bubble-two"></i>&nbsp;<%= pluralize(debate.comment_threads.count, t("debates.show.comment"), t("debates.show.comments")) %>
</p>
<p><%= sanitize(truncate(debate.description, length: 200).html_safe) %></p>
<p><%= render "shared/tags", debate: debate %></p>
</div>
<div class="row votes">
<div class="small-12 column">
<%= link_to debate_votes_path(debate, value: "yes"), class: "like", title: t('votes.agree'), method: "post" do %>
<i class="icon-like"></i>
<span><%= percentage('likes', debate) %></span>
<% end %>
<span class="divider"></span>
<%= link_to debate_votes_path(debate, value: "no"), class: "unlike", title: t('votes.disagree'), method: "post" do %>
<i class="icon-unlike"></i>
<span><%= percentage('dislikes', debate) %></span>
<% end %>
<span class="total-votes right">
<%= pluralize(debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<section role="main">
<div id="featured_debates" class="row">
<%= render @featured_debates %>
</div>
<div class="row">
<!-- HTML for debates featured (3) -->
<div class="small-12 medium-9 column debates-list">
<div id="debates" class="small-12 medium-9 column debates-list">
<%= render @debates %>
</div>
<div class="small-12 medium-3 column">

2
spec/factories.rb
View File

@@ -9,7 +9,7 @@ FactoryGirl.define do
end
factory :debate do
title 'Debate title'
sequence(:title) {|n| "Debate #{n} title"}
description 'Debate description'
terms_of_service '1'
association :author, factory: :user

14
spec/features/debates_spec.rb
View File

@@ -3,16 +3,16 @@ require 'rails_helper'
feature 'Debates' do
scenario 'Index' do
3.times { create(:debate) }
debates = [create(:debate), create(:debate), create(:debate)]
visit debates_path
expect(page).to have_selector('.debate', count: 3)
within first('.debate') do
expect(page).to have_content "Debate title"
expect(page).to have_content "Debate description"
expect(page).to have_content Debate.first.author.name
expect(page).to have_content I18n.l(Date.today)
debates.each do |debate|
within('#debates') do
expect(page).to have_content debate.title
expect(page).to have_content debate.description
end
end
end
@@ -21,7 +21,7 @@ feature 'Debates' do
visit debate_path(debate)
expect(page).to have_content "Debate title"
expect(page).to have_content debate.title
expect(page).to have_content "Debate description"
expect(page).to have_content debate.author.name
expect(page).to have_content I18n.l(Date.today)

12
spec/features/tags_spec.rb
View File

@@ -18,16 +18,20 @@ feature 'Tags' do
end
scenario 'Filtered' do
2.times { create(:debate, tag_list: 'Salud') }
2.times { create(:debate, tag_list: 'Hacienda') }
debate1 = create(:debate, tag_list: 'Salud')
debate2 = create(:debate, tag_list: 'Salud')
debate3 = create(:debate, tag_list: 'Hacienda')
debate4 = create(:debate, tag_list: 'Hacienda')
visit debates_path
first(:link, "Salud").click
within('#debates') do
expect(page).to have_css('.debate', count: 2)
expect(page).to have_content('Salud')
expect(page).to_not have_content('Hacienda')
expect(page).to have_content(debate1.title)
expect(page).to have_content(debate2.title)
expect(page).to_not have_content(debate3.title)
expect(page).to_not have_content(debate4.title)
end
end