[#6714] Remove empty deliverable budget items on submissions

test/integration/deliverables_edit_test.rb

@@ -118,6 +118,34 @@ class DeliverablesEditTest < ActionController::IntegrationTest
     assert_equal 1000.0, @overhead_budget.budget
   end
 
+  should "not create new budget items for the deliverable if the activity, hours, and dollars are not all blank" do
+    TimeEntryActivity.destroy_all
+    visit_contract_page(@contract)
+    click_link_within "#deliverable_details_#{@hourly_deliverable.id}", 'Edit'
+    assert_response :success
+    assert_template 'deliverables/edit'
+
+    within("#deliverable-labor") do
+      fill_in "hrs", :with => ''
+      fill_in "$", :with => '$0'
+    end
+
+    within("#deliverable-overhead") do
+      fill_in "hrs", :with => '0'
+      fill_in "$", :with => ''
+    end
+
+    click_button "Save"
+
+    assert_response :success
+    assert_template 'contracts/show'
+
+    @hourly_deliverable.reload
+    assert_equal 0, @hourly_deliverable.labor_budgets.count
+    assert_equal 0, @hourly_deliverable.overhead_budgets.count
+    assert_equal 0, @hourly_deliverable.fixed_budgets.count
+  end
+
   should "show allow editing the Deliverable Finances section for each Retainer period" do
     @retainer_deliverable = RetainerDeliverable.spawn(:contract => @contract, :manager => @manager, :title => "Retainer")
     @retainer_deliverable.labor_budgets << @labor_budget = LaborBudget.spawn(:deliverable => @retainer_deliverable, :budget => 1000, :hours => 10)
@@ -476,8 +504,8 @@ class DeliverablesEditTest < ActionController::IntegrationTest
     assert_equal [100, nil, nil], @retainer_deliverable.overhead_budgets.collect(&:hours)
     assert_equal [100, nil, nil], @retainer_deliverable.overhead_budgets.collect(&:budget)
 
-    assert_equal 3, @retainer_deliverable.fixed_budgets.count
-    assert_equal [600, nil, nil], @retainer_deliverable.fixed_budgets.collect(&:budget)
+    assert_equal 1, @retainer_deliverable.fixed_budgets.count
+    assert_equal [600], @retainer_deliverable.fixed_budgets.collect(&:budget)
   end
 
   context "locked deliverable" do

test/integration/deliverables_new_test.rb

@@ -278,4 +278,50 @@ class DeliverablesNewTest < ActionController::IntegrationTest
     
   end
 
+  should "not create new budget items for the deliverable if the activity, hours, and dollars are all blank" do
+    @manager = User.generate!
+    @role = Role.generate!
+    User.add_to_project(@manager, @project, @role)
+    TimeEntryActivity.destroy_all
+    
+    visit_contract_page(@contract)
+    click_link 'Add New'
+    assert_response :success
+
+    within("#deliverable-details") do
+      fill_in "Title", :with => 'A New Deliverable with blanks'
+      select "Hourly", :from => "Type"
+      select @manager.name, :from => "Manager"
+    end
+
+    within("#deliverable-labor") do
+      # no activity selected
+      fill_in "hrs", :with => ''
+      fill_in "$", :with => '$0'
+    end
+
+    within("#deliverable-overhead") do
+      # no activity selected
+      fill_in "hrs", :with => '0'
+      fill_in "$", :with => ''
+    end
+
+    within("#deliverable-fixed") do
+      fill_in "title", :with => ''
+      fill_in "budget", :with => '$0'
+      fill_in "markup", :with => ''
+    end
+    
+    click_button "Save"
+
+    assert_response :success
+    assert_template 'contracts/show'
+
+    @deliverable = Deliverable.last
+    assert_equal "A New Deliverable with blanks", @deliverable.title
+    assert_equal 0, @deliverable.labor_budgets.count
+    assert_equal 0, @deliverable.overhead_budgets.count
+    assert_equal 0, @deliverable.fixed_budgets.count
+  end
+  
 end