fixed tests and added total percentage amount validation

sashazykov · sashazykov · commit cea7db1d1530 · 2014-06-22T19:21:46.000+08:00
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -48,6 +48,12 @@ def decide_tip_amounts
     authorize! :decide_tip_amounts, @project
     if request.patch?
       @project.available_amount # preload anything required to get the amount, otherwise it's loaded during the assignation and there are undesirable consequences
+      percentages = params[:project][:tips_attributes].values.map{|tip| tip['amount_percentage'].to_f}
+      if percentages.sum > 100
+        redirect_to decide_tip_amounts_project_path(@project), alert: "You can't assign more than 100% of available funds."
+        return
+      end
+      raise "wrong data" if percentages.min < 0
       @project.attributes = params.require(:project).permit(tips_attributes: [:id, :amount_percentage])
       if @project.save
         message = "The tip amounts have been defined"
diff --git a/app/models/tip.rb b/app/models/tip.rb
@@ -104,7 +104,7 @@ def check_amount_against_project
       available_amount = project.available_amount
       available_amount -= amount_was if amount_was
       if amount > available_amount
-        raise "Not enough funds on project to save #{inspect} (available: #{available_amount})"
+        raise "Not enough funds on project to save #{inspect} (available: #{available_amount}). Project #{project.inspect} available_amount: #{project.available_amount} #{project.tips.count} tips: #{project.tips.map(&:amount).join(', ')}"
       end
     end
   end
diff --git a/features/tip_modifier_interface.feature b/features/tip_modifier_interface.feature
@@ -101,8 +101,9 @@ Feature: A project collaborator can change the tips of commits
     And I click on "Decide tip amounts"
     And I choose the amount "Huge: 5%" on all commits
     And I click on "Send the selected tip amounts"
-    Then there should be a tip of "25" for commit "BBB"
-    And there should be a tip of "8.08833862" for commit "last"
+    Then I should see "You can't assign more than 100% of available funds."
+    And the tip amount for commit "BBB" should be undecided
+    And the tip amount for commit "CCC" should be undecided
 
   Scenario Outline: A collaborator changes the amount of a tip on another project
     Given the project holds tips
