From c536a12e3d29c89a29c8ebed90a3e6b7324362d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Wed, 30 Mar 2016 18:47:40 +0200
Subject: [PATCH 1/2] adds voting to spending proposals index

---
 .../spending_proposals_controller.rb          |  1 +
 .../_spending_proposal.html.erb               |  5 ++-
 spec/features/votes_spec.rb                   | 42 ++++++++++++-------
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/app/controllers/spending_proposals_controller.rb b/app/controllers/spending_proposals_controller.rb
index bc69d6200..9915b0b50 100644
--- a/app/controllers/spending_proposals_controller.rb
+++ b/app/controllers/spending_proposals_controller.rb
@@ -12,6 +12,7 @@ class SpendingProposalsController < ApplicationController
 
   def index
     @spending_proposals = apply_filters_and_search(SpendingProposal).page(params[:page]).for_render
+    set_spending_proposal_votes(@spending_proposals)
   end
 
   def new
diff --git a/app/views/spending_proposals/_spending_proposal.html.erb b/app/views/spending_proposals/_spending_proposal.html.erb
index 4437fba0b..091bc4878 100644
--- a/app/views/spending_proposals/_spending_proposal.html.erb
+++ b/app/views/spending_proposals/_spending_proposal.html.erb
@@ -46,7 +46,10 @@
         </div>
       </div>
 
-
+      <div id="<%= dom_id(spending_proposal) %>_votes" class="small-12 medium-3 column text-center">
+          <%= render 'spending_proposals/votes',
+                    { spending_proposal: spending_proposal, vote_url: vote_spending_proposal_path(spending_proposal, value: 'yes') } %>
+      </div>
 
     </div>
   </div>
diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb
index caadf2637..632162c3c 100644
--- a/spec/features/votes_spec.rb
+++ b/spec/features/votes_spec.rb
@@ -365,25 +365,39 @@ feature 'Votes' do
   feature 'Spending Proposals' do
     background { login_as(@manuela) }
 
-    xscenario "Index shows user votes on proposals" do
-      proposal1 = create(:proposal)
-      proposal2 = create(:proposal)
-      proposal3 = create(:proposal)
-      create(:vote, voter: @manuela, votable: proposal1, vote_flag: true)
+    feature 'Index' do
+      scenario "Index shows user votes on proposals" do
+        spending_proposal1 = create(:spending_proposal)
+        spending_proposal2 = create(:spending_proposal)
+        spending_proposal3 = create(:spending_proposal)
+        create(:vote, voter: @manuela, votable: spending_proposal1, vote_flag: true)
 
-      visit proposals_path
+        visit spending_proposals_path
 
-      within("#proposals") do
-        within("#proposal_#{proposal1.id}_votes") do
-          expect(page).to have_content "You have already supported this proposal. Share it!"
+        within("#investment-projects") do
+          within("#spending_proposal_#{spending_proposal1.id}_votes") do
+            expect(page).to have_content "You have already supported this. Share it!"
+          end
+
+          within("#spending_proposal_#{spending_proposal2.id}_votes") do
+            expect(page).to_not have_content "You have already supported this. Share it!"
+          end
+
+          within("#spending_proposal_#{spending_proposal3.id}_votes") do
+            expect(page).to_not have_content "You have already supported this. Share it!"
+          end
         end
+      end
 
-        within("#proposal_#{proposal2.id}_votes") do
-          expect(page).to_not have_content "You have already supported this proposal. Share it!"
-        end
+      scenario 'Create from spending proposal index', :js do
+        spending_proposal = create(:spending_proposal)
+        visit spending_proposals_path
 
-        within("#proposal_#{proposal3.id}_votes") do
-          expect(page).to_not have_content "You have already supported this proposal. Share it!"
+        within('.supports') do
+          find('.in-favor a').click
+
+          expect(page).to have_content "1 support"
+          expect(page).to have_content "You have already supported this. Share it!"
         end
       end
     end

From dc8cd13230e1d92d5dfb413c9c63b3228192f99b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Wed, 30 Mar 2016 18:53:22 +0200
Subject: [PATCH 2/2] adds geozone info to spending proposals in index

---
 app/views/spending_proposals/_spending_proposal.html.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/spending_proposals/_spending_proposal.html.erb b/app/views/spending_proposals/_spending_proposal.html.erb
index 091bc4878..7dff660fc 100644
--- a/app/views/spending_proposals/_spending_proposal.html.erb
+++ b/app/views/spending_proposals/_spending_proposal.html.erb
@@ -37,6 +37,9 @@
                   <%= t("shared.collective") %>
                 </span>
               <% end %>
+
+              <span class="bullet">&nbsp;&bull;&nbsp;</span>
+              <%= geozone_name(spending_proposal) %>
             </p>
             <div class="investment-project-description">
               <p><%= link_to spending_proposal.description, spending_proposal_path(spending_proposal) %></p>