diff --git a/app/views/contracts/show.html.erb b/app/views/contracts/show.html.erb index bc54681..864236d 100644 --- a/app/views/contracts/show.html.erb +++ b/app/views/contracts/show.html.erb @@ -104,7 +104,7 @@ <%= h deliverable.manager.try(:name) %> <%= format_budget_for_deliverable(deliverable, deliverable.labor_budget_spent, deliverable.labor_budget_total, :class => 'labor') %> <%= format_budget_for_deliverable(deliverable, deliverable.overhead_spent, deliverable.overhead_budget_total, :class => 'overhead') %> - <%= format_budget_for_deliverable(deliverable, 0, 0) %><%# TODO: Release 2, Fixed Budgets %> + <%= format_budget_for_deliverable(deliverable, 0, deliverable.fixed_budget_total, :class => 'fixed') %> <% end %> diff --git a/test/integration/contracts_show_test.rb b/test/integration/contracts_show_test.rb index 08ea047..e3494f5 100644 --- a/test/integration/contracts_show_test.rb +++ b/test/integration/contracts_show_test.rb @@ -210,6 +210,23 @@ class ContractsShowTest < ActionController::IntegrationTest end + should "show the total fixed budget for a Deliverable" do + @manager = User.generate! + + @deliverable1 = FixedDeliverable.generate!(:contract => @contract, :manager => @manager) + + FixedBudget.generate!(:deliverable => @deliverable1, :budget => '$1,000', :markup => '$100') + FixedBudget.generate!(:deliverable => @deliverable1, :budget => '$2,000', :markup => '200%') + + visit_contract_page(@contract) + assert_select "table#deliverables" do + assert_select "td.fixed", :text => /3,000/ + end + + end + + should "QUESTION: show the total fixed budget spent for a Deliverable" + should "show the current period for a Retainer" do today_mock = Date.new(2010,2,15) Date.stubs(:today).returns(today_mock)