Merge branch 'master' into polls

spec/support/common_actions.rb

@@ -180,6 +180,17 @@ module CommonActions
     expect(page).to_not have_selector('.in-favor a')
   end
 
+  def expect_message_selecting_not_allowed
+    expect(page).to have_content 'No Selecting Allowed'
+    expect(page).to_not have_selector('.in-favor a')
+  end
+
+  def expect_message_organizations_cannot_vote
+    #expect(page).to have_content 'Organisations are not permitted to vote.'
+    expect(page).to have_content 'Organization'
+    expect(page).to have_selector('.in-favor a', visible: false)
+  end
+
   def create_featured_proposals
     [create(:proposal, :with_confidence_score, cached_votes_up: 100),
      create(:proposal, :with_confidence_score, cached_votes_up: 90),
@@ -255,4 +266,11 @@ module CommonActions
     end
   end
 
+  def add_to_ballot(budget_investment)
+    within("#budget_investment_#{budget_investment.id}") do
+      find('.add a').trigger('click')
+      expect(page).to have_content "Remove"
+    end
+  end
+
 end