Merge branch 'polls' into polls-geozones

app/helpers/budgets_helper.rb

@@ -10,7 +10,7 @@ module BudgetsHelper
 
   def namespaced_budget_investment_path(investment, options={})
     case namespace
-    when "management::budgets"
+    when "management/budgets"
       management_budget_investment_path(investment.budget, investment, options)
     else
       budget_investment_path(investment.budget, investment, options)
@@ -19,7 +19,7 @@ module BudgetsHelper
 
   def namespaced_budget_investment_vote_path(investment, options={})
     case namespace
-    when "management::budgets"
+    when "management/budgets"
       vote_management_budget_investment_path(investment.budget, investment, options)
     else
       vote_budget_investment_path(investment.budget, investment, options)

spec/features/budgets/ballots_spec.rb

@@ -517,7 +517,7 @@ feature 'Ballots' do
       add_to_ballot(bi1)
 
       within("#budget_investment_#{bi2.id}") do
-        find("div.ballot").hover
+        find("div.ballot").trigger("mouseover")
         expect(page).to have_content('Price is higher than the available amount left')
         expect(page).to have_selector('.in-favor a', visible: false)
       end
@@ -594,4 +594,4 @@ feature 'Ballots' do
       end
     end
   end
-end
+end