fixing conflicts

spec/features/votes_spec.rb

@@ -569,3 +569,6 @@ feature 'Votes' do
     end
   end
 end
+
+
+pending "Remove support button text - tested in Update spec"

spec/helpers/proposals_helper_spec.rb

@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+describe ProposalsHelper do
+
+  describe "#progress_bar_percentage" do
+
+    it "should be 0 if no votes" do
+      proposal = create(:proposal)
+      expect(progress_bar_percentage(proposal)).to eq 0
+    end
+
+    it "should be a between 1 and 100 if there are votes but less than needed" do
+      proposal = create(:proposal, cached_votes_up: Proposal.votes_needed_for_success/2)
+      expect(progress_bar_percentage(proposal)).to eq 50
+    end
+
+    it "should be 100 if there are more votes than needed" do
+      proposal = create(:proposal, cached_votes_up: Proposal.votes_needed_for_success*2)
+      expect(progress_bar_percentage(proposal)).to eq 100
+    end
+  end
+
+end