Merge pull request #145 from AyuntamientoMadrid/home

moves featured debates to home page

app/controllers/application_controller.rb

@@ -37,4 +37,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def set_voted_values(debates_ids)
+    @voted_values = current_user ? current_user.votes_on_debates(debates_ids) : {}
+  end
 end

app/controllers/debates_controller.rb

@@ -9,7 +9,6 @@ class DebatesController < ApplicationController
     else
       @debates = Debate.all.order("created_at DESC")
       set_voted_values @debates.map(&:id)
-      @featured_debates = @debates.to_a.shift(3)
     end
   end
 
@@ -54,7 +53,4 @@ class DebatesController < ApplicationController
       params.require(:debate).permit(:title, :description, :tag_list, :terms_of_service, :captcha, :captcha_key)
     end
 
-    def set_voted_values(debates_ids)
-      @voted_values = current_user ? current_user.votes_on_debates(debates_ids) : {}
-    end
 end

app/controllers/welcome_controller.rb

@@ -0,0 +1,9 @@
+class WelcomeController < ApplicationController
+  skip_authorization_check
+
+  def index
+    @featured_debates = Debate.order("created_at DESC").limit(3)
+    set_voted_values @featured_debates.map(&:id)
+  end
+
+end

app/views/debates/_debate.html.erb

@@ -1,4 +1,4 @@
-<div id="debate-<%= debate.id %>" class="debate">
+<div id="<%= dom_id(debate) %>" class="debate">
   <div class="panel">
     <div class="row">
 

app/views/debates/index.html.erb

@@ -1,7 +1,4 @@
 <section role="main">
-  <div id="featured-debates" class="row">
-    <%= render partial: "featured_debate", collection: @featured_debates %>
-  </div>
   <div class="row">
     <div id="debates" class="small-12 medium-9 column debates-list">
       <%= render @debates %>

app/views/layouts/_header.html.erb

@@ -41,7 +41,7 @@
       <div class="small-12 column text-center">
         <h1><%= t("layouts.header.open_city") %></h1>
         <h2><%= t("layouts.header.open_city_slogan") %></h2>
-        <%= link_to t("layouts.header.create_debate"), new_debate_path, class: 'button radius' %>
+        <%= link_to t("layouts.header.see_all_debates"), debates_path, class: 'button radius' %>
       </div>
     </div>
   <% end %>

app/views/welcome/index.html.erb

@@ -0,0 +1,13 @@
+<section role="main">
+  <div id="featured-debates" class="row">
+    <%= render partial: "featured_debate", collection: @featured_debates %>
+  </div>
+  <div class="row">
+    <div class="small-12 medium-3 column">
+      <aside role="complementary">
+        <%= link_to t("layouts.header.see_all_debates"), debates_path, class: 'button radius expand' %>
+        <%= render "shared/tag_cloud" %>
+      </aside>
+    </div>
+  </div>
+</section>

config/locales/en.yml

@@ -9,7 +9,7 @@ en:
       menu: Menu
       open_city: We are opening Madrid
       open_city_slogan: So the citizens can decide what kind of city they want.
-      create_debate: Create a debate
+      see_all_debates: See all debates
       my_account_link: My account
       language: Site language
     footer:

config/locales/es.yml

@@ -9,7 +9,7 @@ es:
       menu: Menú
       open_city: Estamos abriendo Madrid
       open_city_slogan: Para que todos los madrileños decidamos que ciudad queremos tener.
-      create_debate: Crea un debate
+      see_all_debates: Ver todos los debates
       my_account_link: Mi cuenta
       language: Idioma de la página
     footer:

config/routes.rb

@@ -5,7 +5,7 @@ Rails.application.routes.draw do
   # See how all your routes lay out with "rake routes".
 
   # You can have the root of your site routed with "root"
-  root 'debates#index'
+  root 'welcome#index'
 
   resources :debates do
     member do

spec/features/debates_spec.rb

@@ -4,18 +4,9 @@ feature 'Debates' do
 
   scenario 'Index' do
     debates = [create(:debate), create(:debate), create(:debate)]
-    featured_debates = [create(:debate), create(:debate), create(:debate)]
 
     visit debates_path
 
-    expect(page).to have_selector('#featured-debates .debate-featured', count: 3)
-    featured_debates.each do |debate|
-      within('#featured-debates') do
-        expect(page).to have_content debate.title
-        expect(page).to have_css("a[href='#{debate_path(debate)}']", text: debate.description)
-      end
-    end
-
     expect(page).to have_selector('#debates .debate', count: 3)
     debates.each do |debate|
       within('#debates') do

spec/features/home_spec.rb

@@ -2,4 +2,19 @@ require 'rails_helper'
 
 feature "Home" do
 
+  scenario 'featured debates' do
+    featured_debates = [create(:debate), create(:debate), create(:debate)]
+
+    visit root_path
+
+    expect(page).to have_selector('#featured-debates .debate-featured', count: 3)
+    featured_debates.each do |debate|
+      within('#featured-debates') do
+        expect(page).to have_content debate.title
+        expect(page).to have_css("a[href='#{debate_path(debate)}']", text: debate.description)
+      end
+    end
+
+  end
+
 end

spec/features/votes_spec.rb

@@ -13,7 +13,55 @@ feature 'Votes' do
       visit debate_path(@debate)
     end
 
-    scenario "Index show user votes on debates" do
+    scenario "Home shows user votes on featured debates" do
+      debate1 = create(:debate)
+      debate2 = create(:debate)
+      debate3 = create(:debate)
+      vote = create(:vote, voter: @manuela, votable: debate1, vote_flag: true)
+      vote = create(:vote, voter: @manuela, votable: debate3, vote_flag: false)
+
+      visit root_path
+
+      within("#featured-debates") do
+        within("#debate_#{debate1.id}_votes") do
+          within(".in-favor") do
+            expect(page).to have_css("a.voted")
+            expect(page).to_not have_css("a.no-voted")
+          end
+
+          within(".against") do
+            expect(page).to have_css("a.no-voted")
+            expect(page).to_not have_css("a.voted")
+          end
+        end
+
+        within("#debate_#{debate2.id}_votes") do
+          within(".in-favor") do
+            expect(page).to_not have_css("a.voted")
+            expect(page).to_not have_css("a.no-voted")
+          end
+
+          within(".against") do
+            expect(page).to_not have_css("a.no-voted")
+            expect(page).to_not have_css("a.voted")
+          end
+        end
+
+        within("#debate_#{debate3.id}_votes") do
+          within(".in-favor") do
+            expect(page).to have_css("a.no-voted")
+            expect(page).to_not have_css("a.voted")
+          end
+
+          within(".against") do
+            expect(page).to have_css("a.voted")
+            expect(page).to_not have_css("a.no-voted")
+          end
+        end
+      end
+    end
+
+    scenario "Index shows user votes on debates" do
       debate1 = create(:debate)
       debate2 = create(:debate)
       debate3 = create(:debate)
@@ -22,42 +70,43 @@ feature 'Votes' do
 
       visit debates_path
 
-      within("#debate_#{debate1.id}_votes") do
+      within("#debates") do
-        within(".in-favor") do
+        within("#debate_#{debate1.id}_votes") do
-          expect(page).to have_css("a.voted")
+          within(".in-favor") do
-          expect(page).to_not have_css("a.no-voted")
+            expect(page).to have_css("a.voted")
+            expect(page).to_not have_css("a.no-voted")
+          end
+
+          within(".against") do
+            expect(page).to have_css("a.no-voted")
+            expect(page).to_not have_css("a.voted")
+          end
         end
 
-        within(".against") do
+        within("#debate_#{debate2.id}_votes") do
-          expect(page).to have_css("a.no-voted")
+          within(".in-favor") do
-          expect(page).to_not have_css("a.voted")
+            expect(page).to_not have_css("a.voted")
+            expect(page).to_not have_css("a.no-voted")
+          end
+
+          within(".against") do
+            expect(page).to_not have_css("a.no-voted")
+            expect(page).to_not have_css("a.voted")
+          end
+        end
+
+        within("#debate_#{debate3.id}_votes") do
+          within(".in-favor") do
+            expect(page).to have_css("a.no-voted")
+            expect(page).to_not have_css("a.voted")
+          end
+
+          within(".against") do
+            expect(page).to have_css("a.voted")
+            expect(page).to_not have_css("a.no-voted")
+          end
         end
       end
-
-      within("#debate_#{debate2.id}_votes") do
-        within(".in-favor") do
-          expect(page).to_not have_css("a.voted")
-          expect(page).to_not have_css("a.no-voted")
-        end
-
-        within(".against") do
-          expect(page).to_not have_css("a.no-voted")
-          expect(page).to_not have_css("a.voted")
-        end
-      end
-
-      within("#debate_#{debate3.id}_votes") do
-        within(".in-favor") do
-          expect(page).to have_css("a.no-voted")
-          expect(page).to_not have_css("a.voted")
-        end
-
-        within(".against") do
-          expect(page).to have_css("a.voted")
-          expect(page).to_not have_css("a.no-voted")
-        end
-      end
-
     end
 
     scenario 'Show no votes' do
@@ -114,7 +163,7 @@ feature 'Votes' do
     end
 
     scenario 'Create from debate featured', :js do
-      visit debates_path
+      visit root_path
 
       within("#featured-debates") do
         find('.in-favor a').click
@@ -131,15 +180,13 @@ feature 'Votes' do
 
         expect(page).to have_content "1 vote"
       end
-      expect(URI.parse(current_url).path).to eq(debates_path)
+      expect(URI.parse(current_url).path).to eq(root_path)
     end
 
     scenario 'Create from debate index', :js do
-      3.times { create(:debate) }
       visit debates_path
 
       within("#debates") do
-        expect(page).to have_css(".debate", count: 1)
 
         find('.in-favor a').click